summaryrefslogtreecommitdiff
path: root/app/views/gui_functions
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-15 22:01:14 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-15 22:01:14 +0100
commit40a879fb6a3db4db302eb5113586901eb45b3279 (patch)
treece7c1db61f85d3980baeb7695650c7bb3f3a4f8f /app/views/gui_functions
parent96fc4789d9991548b9fd1144f185da1f3464f156 (diff)
parentd44b8c81f939deb1e83e17d19c580b3bf6ac9ab6 (diff)
Merge branch 'abilities_for_gui_functions' into develop
Diffstat (limited to 'app/views/gui_functions')
-rw-r--r--app/views/gui_functions/_index_core.html.haml29
-rw-r--r--app/views/gui_functions/index.html.haml3
-rw-r--r--app/views/gui_functions/show.html.haml29
3 files changed, 32 insertions, 29 deletions
diff --git a/app/views/gui_functions/_index_core.html.haml b/app/views/gui_functions/_index_core.html.haml
index 093a0d7..815b9c3 100644
--- a/app/views/gui_functions/_index_core.html.haml
+++ b/app/views/gui_functions/_index_core.html.haml
@@ -8,19 +8,20 @@
- reset_cycle
- for gui_function in gui_functions
%tr{:class => cycle('odd', 'even')}
- %td= gui_function.category
- %td
- = gui_function.name
- - if !gui_function.description.blank?
- %br
- %i= gui_function.description
- - @user_groups.each do |user_group|
- - if gui_function.gui_function_memberships.find_by_user_group_id(user_group.id)
- - if gui_function.gui_function_memberships.find_by_user_group_id(user_group.id).activated == true
- %td= 'x'
+ - cache(['gui_functions_table_row', I18n.locale, gui_function]) do
+ %td= gui_function.category
+ %td
+ = gui_function.name
+ - if !gui_function.description.blank?
+ %br
+ %i= gui_function.description
+ - @user_groups.each do |user_group|
+ - if gui_function.gui_function_memberships.find_by_user_group_id(user_group.id)
+ - if gui_function.gui_function_memberships.find_by_user_group_id(user_group.id).activated == true
+ %td= 'x'
+ - else
+ %td= ''
- else
- %td= ''
- - else
- %td= 'x'
+ %td= 'x'
- =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => gui_function} \ No newline at end of file
+ =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => gui_function} \ No newline at end of file
diff --git a/app/views/gui_functions/index.html.haml b/app/views/gui_functions/index.html.haml
index ef909f0..9b53918 100644
--- a/app/views/gui_functions/index.html.haml
+++ b/app/views/gui_functions/index.html.haml
@@ -1,6 +1,7 @@
- title t("gui_functions.index.page_title")
- if @gui_functions && @gui_functions.count > 0
- = render "index_core", :gui_functions => @gui_functions
+ - cache(['gui_functions_table', I18n.locale, @gui_functions.reorder(:updated_at).last, @gui_functions.count]) do
+ = render "index_core", :gui_functions => @gui_functions
= render :partial => 'shared/create_link', :locals => {:child_class => GuiFunction} \ No newline at end of file
diff --git a/app/views/gui_functions/show.html.haml b/app/views/gui_functions/show.html.haml
index 0fc2dd9..8af329a 100644
--- a/app/views/gui_functions/show.html.haml
+++ b/app/views/gui_functions/show.html.haml
@@ -1,18 +1,19 @@
- title t("gui_functions.show.page_title")
-%p
- %strong= t('gui_functions.show.name') + ":"
- = @gui_function.name
-%p
- %strong= t('gui_functions.show.description') + ":"
- = @gui_function.description
-
-- @user_groups.each do |user_group|
+- cache(['gui_function_show', I18n.locale, @gui_function]) do
+ %p
+ %strong= t('gui_functions.show.name') + ":"
+ = @gui_function.name
%p
- %strong= "#{user_group}:"
- - if @gui_function.gui_function_memberships.where(:user_group_id => user_group.id, :activated => true).count > 0
- = 'x'
- - else
- = 'not activated'
+ %strong= t('gui_functions.show.description') + ":"
+ = @gui_function.description
+
+ - @user_groups.each do |user_group|
+ %p
+ %strong= "#{user_group}:"
+ - if @gui_function.gui_function_memberships.where(:user_group_id => user_group.id, :activated => true).count > 0
+ = 'x'
+ - else
+ = 'not activated'
-= render :partial => 'shared/show_edit_destroy_part', :locals => { :child => @gui_function } \ No newline at end of file
+ = render :partial => 'shared/show_edit_destroy_part', :locals => { :child => @gui_function } \ No newline at end of file