diff options
| author | cedricnjanga | 2018-01-24 19:55:56 -0800 |
|---|---|---|
| committer | cedricnjanga | 2018-01-31 07:20:21 -0800 |
| commit | dd61691343892d502842341bc94ca8b355a716cc (patch) | |
| tree | 289bce2b8e2b1b8b0fdd139e0dc3d31b85e0c8f7 /app/views/calendars | |
| parent | 6632217117a66bd09b2e8261e4351add9971d47c (diff) | |
| download | chouette-core-dd61691343892d502842341bc94ca8b355a716cc.tar.bz2 | |
update calendar build_links for table builder
Diffstat (limited to 'app/views/calendars')
| -rw-r--r-- | app/views/calendars/index.html.slim | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/app/views/calendars/index.html.slim b/app/views/calendars/index.html.slim index a2d6b4731..f7192bc01 100644 --- a/app/views/calendars/index.html.slim +++ b/app/views/calendars/index.html.slim @@ -1,4 +1,14 @@ +<<<<<<< HEAD - breadcrumb :calendars, workgroup +======= +<<<<<<< HEAD +- breadcrumb :calendars +<<<<<<< HEAD +======= +======= +- breadcrumb :calendars, current_workgroup +>>>>>>> update calendar build_links for table builder +>>>>>>> update calendar build_links for table builder - 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') |