Download as
Browse Code »

Commit a63a70f8b306f19563c1985f61ede736d5aa3e6a

Authored by Luan
1 parent d2a3584b
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Adding fix to the date filters on search

Showing 3 changed files with 9 additions and 5 deletions   Show diff stats
src/colab/custom_settings.py
  Diff comments   View file @a63a70f
@@ -15,7 +15,7 @@ LANGUAGES = ( @@ -15,7 +15,7 @@ LANGUAGES = (
15 15
16 DJANGO_DATE_FORMAT_TO_JS = { 16 DJANGO_DATE_FORMAT_TO_JS = {
17 'pt-br': ('pt-BR', 'dd/MM/yyyy'), 17 'pt-br': ('pt-BR', 'dd/MM/yyyy'),
18 - 'en': ('en', 'MM/dd/yyyy'), 18 + 'es': ('es', 'dd/MM/yyyy'),
19 } 19 }
20 20
21 LANGUAGE_CODE = 'pt-br' 21 LANGUAGE_CODE = 'pt-br'
src/search/views.py
  Diff comments   View file @a63a70f
@@ -10,7 +10,7 @@ class ColabSearchView(SearchView): @@ -10,7 +10,7 @@ class ColabSearchView(SearchView):
10 def extra_context(self, *args, **kwargs): 10 def extra_context(self, *args, **kwargs):
11 11
12 use_language, date_format = settings.DJANGO_DATE_FORMAT_TO_JS.get( 12 use_language, date_format = settings.DJANGO_DATE_FORMAT_TO_JS.get(
13 - self.request.LANGUAGE_CODE 13 + self.request.LANGUAGE_CODE, (None, None)
14 ) 14 )
15 15
16 types = { 16 types = {
src/templates/search/search.html
  Diff comments   View file @a63a70f
@@ -3,14 +3,18 @@ @@ -3,14 +3,18 @@
3 3
4 {% block head_js %} 4 {% block head_js %}
5 <script type="text/javascript" src="{{ STATIC_URL }}third-party/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js"></script> 5 <script type="text/javascript" src="{{ STATIC_URL }}third-party/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
6 -<script type="text/javascript" src="{{ STATIC_URL }}third-party/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.{{ use_language }}.js"></script> 6 +{% if use_language %}
  7 + <script type="text/javascript" src="{{ STATIC_URL }}third-party/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.{{ use_language }}.js"></script>
  8 +{% endif %}
7 9
8 <script type="text/javascript"> 10 <script type="text/javascript">
9 $(function () { 11 $(function () {
10 $('#datepicker_since, #datepicker_until').datetimepicker({ 12 $('#datepicker_since, #datepicker_until').datetimepicker({
11 pickTime: false, 13 pickTime: false,
12 - language: '{{ use_language }}',  
13 - format: '{{ date_format }}', 14 + {% if use_language and date_format %}
  15 + language: '{{ use_language }}',
  16 + format: '{{ date_format }}',
  17 + {% endif %}
14 }); 18 });
15 }); 19 });
16 </script> 20 </script>