Merge 0.2.14 bugfixes

This commit is contained in:
Garret Wassermann 2019-02-15 19:44:41 -05:00
commit c97483deff
6 changed files with 3925 additions and 3242 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -27,7 +27,7 @@ class Command(BaseCommand):
def __init__(self): def __init__(self):
BaseCommand.__init__(self) BaseCommand.__init__(self)
self.option_list += ( self.option_list = (
make_option( make_option(
'--queues', '--queues',
help='Queues to include (default: all). Use queue slugs'), help='Queues to include (default: all). Use queue slugs'),
@ -43,9 +43,9 @@ class Command(BaseCommand):
queue_slugs = None queue_slugs = None
queues = [] queues = []
if options['verboseescalation']: if 'verboseescalation' in options:
verbose = True verbose = True
if options['queues']: if 'queues' in options:
queue_slugs = options['queues'] queue_slugs = options['queues']
if queue_slugs is not None: if queue_slugs is not None:

View File

@ -50,7 +50,7 @@
<script> <script>
$( function() { $( function() {
$( "#id_due_date" ).datepicker(); $( "#id_due_date" ).datepicker({dateFormat: 'yy-mm-dd'});
} ); } );
</script> </script>

View File

@ -208,7 +208,7 @@
{% block helpdesk_js %} {% block helpdesk_js %}
<script type='text/javascript' language='javascript'> <script type='text/javascript' language='javascript'>
$( function() { $( function() {
$( "#id_due_date" ).datepicker(); $( "#id_due_date" ).datepicker({dateFormat: 'yy-mm-dd'});
} ); } );
</script> </script>