aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcedricnjanga2017-09-06 16:56:33 +0200
committercedricnjanga2017-09-06 16:56:33 +0200
commite4c818de9e2e7292c2e04d8e76f9f2f43915f439 (patch)
treeeea036cfae25d25e718b9a55aaa7d8209830e03a
parent5a500653e997f6efed95524fb121b74b33a39339 (diff)
downloadchouette-core-e4c818de9e2e7292c2e04d8e76f9f2f43915f439.tar.bz2
Add Organisation column in Calendars#index Table
-rw-r--r--app/views/calendars/index.html.slim4
-rw-r--r--config/locales/calendars.en.yml1
-rw-r--r--config/locales/calendars.fr.yml1
3 files changed, 6 insertions, 0 deletions
diff --git a/app/views/calendars/index.html.slim b/app/views/calendars/index.html.slim
index 56232b0af..24ed15484 100644
--- a/app/views/calendars/index.html.slim
+++ b/app/views/calendars/index.html.slim
@@ -31,6 +31,10 @@
attribute: 'short_name' \
), \
TableBuilderHelper::Column.new( \
+ key: :organisation, \
+ attribute: Proc.new { |c| c.organisation.name } \
+ ), \
+ TableBuilderHelper::Column.new( \
key: :shared, \
attribute: Proc.new { |c| t("#{c.try(:shared)}") } \
) \
diff --git a/config/locales/calendars.en.yml b/config/locales/calendars.en.yml
index cb1ede4c7..42e26e995 100644
--- a/config/locales/calendars.en.yml
+++ b/config/locales/calendars.en.yml
@@ -64,6 +64,7 @@ en:
date_ranges: Date ranges
dates: Dates
shared: Shared
+ organisation: Organisation
errors:
models:
calendar:
diff --git a/config/locales/calendars.fr.yml b/config/locales/calendars.fr.yml
index 1b403c3f2..63f6465d9 100644
--- a/config/locales/calendars.fr.yml
+++ b/config/locales/calendars.fr.yml
@@ -64,6 +64,7 @@ fr:
date_ranges: Intervalles de dates
dates: Dates
shared: Partagé
+ organisation: Organisation
errors:
models:
calendar: