diff options
| author | Zog | 2018-01-31 11:39:39 +0100 |
|---|---|---|
| committer | cedricnjanga | 2018-02-06 11:17:46 -0800 |
| commit | a261ce4c824ad8ffecca7b4fb98aaa3b68ba529c (patch) | |
| tree | 0c9cdd714aa41b0172568eb8d2cd5443dd05dbf7 | |
| parent | eaa3c0156f8774ef396854ef4819e27815720d6d (diff) | |
| download | chouette-core-a261ce4c824ad8ffecca7b4fb98aaa3b68ba529c.tar.bz2 | |
Refs #5683 @2H; Fix specs and refactor action_links
Note: Did not fix the missing workgroup in the calendar mailer
| -rw-r--r-- | app/controllers/calendars_controller.rb | 4 | ||||
| -rw-r--r-- | app/helpers/table_builder_helper.rb | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb index 3018b48e1..75e7a4ddd 100644 --- a/app/controllers/calendars_controller.rb +++ b/app/controllers/calendars_controller.rb @@ -7,7 +7,7 @@ class CalendarsController < ChouetteController respond_to :html respond_to :json, only: :show respond_to :js, only: :index - + belongs_to :workgroup belongs_to :workgroup @@ -127,4 +127,4 @@ class CalendarsController < ChouetteController scope end -end
\ No newline at end of file +end diff --git a/app/helpers/table_builder_helper.rb b/app/helpers/table_builder_helper.rb index f48075ed9..2068dd23c 100644 --- a/app/helpers/table_builder_helper.rb +++ b/app/helpers/table_builder_helper.rb @@ -395,7 +395,6 @@ module TableBuilderHelper klass << link.extra_class if link.extra_class klass << 'delete-action' if link.method == :delete klass << 'disabled' if link.disabled - content_tag( :li, link_to( |