Commit 4f582f12 by Administrator

Merge branch '3199-fix-bdm-admin-shifts-calendar' into 'dev_cooperatic'

3199 fix bdm admin shifts calendar

See merge request !182
parents ad1eda68 224504d7
Pipeline #2254 passed with stage
in 1 minute 23 seconds
...@@ -351,6 +351,7 @@ def manage_regular_shifts(request): ...@@ -351,6 +351,7 @@ def manage_regular_shifts(request):
'open_on_sunday': getattr(settings, 'OPEN_ON_SUNDAY', False), 'open_on_sunday': getattr(settings, 'OPEN_ON_SUNDAY', False),
'show_ftop_button': getattr(settings, 'BDM_SHOW_FTOP_BUTTON', True), 'show_ftop_button': getattr(settings, 'BDM_SHOW_FTOP_BUTTON', True),
'has_committe_shift': committees_shift_id is not None, 'has_committe_shift': committees_shift_id is not None,
'committees_shift_id': committees_shift_id,
'ASSOCIATE_MEMBER_SHIFT' : getattr(settings, 'ASSOCIATE_MEMBER_SHIFT', '') 'ASSOCIATE_MEMBER_SHIFT' : getattr(settings, 'ASSOCIATE_MEMBER_SHIFT', '')
} }
return HttpResponse(template.render(context, request)) return HttpResponse(template.render(context, request))
......
...@@ -95,7 +95,8 @@ ...@@ -95,7 +95,8 @@
var max_begin_hour = '{{max_begin_hour}}' var max_begin_hour = '{{max_begin_hour}}'
var couchdb_dbname = '{{db}}'; var couchdb_dbname = '{{db}}';
var couchdb_server = '{{couchdb_server}}' + couchdb_dbname; var couchdb_server = '{{couchdb_server}}' + couchdb_dbname;
var committees_shift_id = '{{ASSOCIATE_MEMBER_SHIFT}}'; var committees_shift_id = '{{committees_shift_id}}';
var ASSOCIATE_MEMBER_SHIFT = '{{ASSOCIATE_MEMBER_SHIFT}}';
</script> </script>
<script src='{% static "js/common.js" %}?v=1651853225'></script> <script src='{% static "js/common.js" %}?v=1651853225'></script>
<script src='{% static "js/all_common.js" %}?v=1651853225'></script> <script src='{% static "js/all_common.js" %}?v=1651853225'></script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment