diff options
| -rw-r--r-- | app/controllers/calendars_controller.rb | 3 | ||||
| -rw-r--r-- | app/views/calendars/index.html.slim | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb index 61a62c285..eaff3b0c6 100644 --- a/app/controllers/calendars_controller.rb +++ b/app/controllers/calendars_controller.rb @@ -1,5 +1,4 @@ class CalendarsController < ChouetteController - include WorkgroupSupport include PolicyChecker defaults resource_class: Calendar before_action :ransack_contains_date, only: [:index] @@ -96,4 +95,4 @@ class CalendarsController < ChouetteController scope end -end +end
\ No newline at end of file diff --git a/app/views/calendars/index.html.slim b/app/views/calendars/index.html.slim index f7192bc01..04ae8c758 100644 --- a/app/views/calendars/index.html.slim +++ b/app/views/calendars/index.html.slim @@ -1,6 +1,9 @@ <<<<<<< HEAD +<<<<<<< HEAD - breadcrumb :calendars, workgroup ======= +======= +>>>>>>> Make some changes to avoid unnacessaty lines of code <<<<<<< HEAD - breadcrumb :calendars <<<<<<< HEAD @@ -12,7 +15,14 @@ - content_for :page_header_actions do - if policy(Calendar).create? = link_to(t('actions.add'), new_workgroup_calendar_path(current_workgroup), class: 'btn btn-default') +<<<<<<< HEAD +======= +>>>>>>> First draft for including calendars into workgroup for having appropriate scoping +======= +- breadcrumb :calendars, workgroup +>>>>>>> Make some changes to avoid unnacessaty lines of code +>>>>>>> Make some changes to avoid unnacessaty lines of code .page_content .container-fluid |