From 13e16223977966f9751e7b8e3fb587e2df0a0801 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sun, 10 Mar 2013 09:52:31 +0100 Subject: Add a second configuration option. --- app/views/users/_switchboards.html.haml | 7 +++++++ app/views/users/show.html.haml | 3 +++ 2 files changed, 10 insertions(+) create mode 100644 app/views/users/_switchboards.html.haml (limited to 'app/views/users') diff --git a/app/views/users/_switchboards.html.haml b/app/views/users/_switchboards.html.haml new file mode 100644 index 0000000..f79d6b8 --- /dev/null +++ b/app/views/users/_switchboards.html.haml @@ -0,0 +1,7 @@ +-# Switchboards +-# +- if (can?( :index, Switchboard ) && user.switchboards.any? ) || can?( :create, Switchboard ) + %h2= t('switchboards.index.page_title') + - if can?( :index, Switchboard ) && user.switchboards.count > 0 + = render :partial => "switchboards/index_core", :locals => {:switchboards => user.switchboards, :user => user} + = render :partial => 'shared/create_link', :locals => {:parent => user, :child_class => Conference} \ No newline at end of file diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index ea90ab4..98f7cc6 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -87,3 +87,6 @@ - cache(['user_show_conferences_overview', I18n.locale, @user, @user.conferences]) do = render :partial => 'conferences', :locals => {:user => @user} + + - cache(['user_switchboards_overview', I18n.locale, @user, @user.switchboards]) do + = render :partial => 'switchboards', :locals => {:user => @user} \ No newline at end of file -- cgit v1.2.3 From b29f5e637816aeca6f5cc7c9acb3f380469d1630 Mon Sep 17 00:00:00 2001 From: Julian Pawlowski Date: Sun, 10 Mar 2013 14:33:40 +0100 Subject: fix link --- app/views/users/_switchboards.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views/users') diff --git a/app/views/users/_switchboards.html.haml b/app/views/users/_switchboards.html.haml index f79d6b8..8dca15f 100644 --- a/app/views/users/_switchboards.html.haml +++ b/app/views/users/_switchboards.html.haml @@ -4,4 +4,4 @@ %h2= t('switchboards.index.page_title') - if can?( :index, Switchboard ) && user.switchboards.count > 0 = render :partial => "switchboards/index_core", :locals => {:switchboards => user.switchboards, :user => user} - = render :partial => 'shared/create_link', :locals => {:parent => user, :child_class => Conference} \ No newline at end of file + = render :partial => 'shared/create_link', :locals => {:parent => user, :child_class => Switchboard} \ No newline at end of file -- cgit v1.2.3 From b9aeac77779f7a9ae0e51b8d95adc7d542e09ece Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sun, 10 Mar 2013 18:32:13 +0100 Subject: Small fixes. --- app/views/users/_switchboards.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views/users') diff --git a/app/views/users/_switchboards.html.haml b/app/views/users/_switchboards.html.haml index 8dca15f..183b6ae 100644 --- a/app/views/users/_switchboards.html.haml +++ b/app/views/users/_switchboards.html.haml @@ -1,6 +1,6 @@ -# Switchboards -# -- if (can?( :index, Switchboard ) && user.switchboards.any? ) || can?( :create, Switchboard ) +- if SipAccount.any? && (can?( :index, Switchboard ) && user.switchboards.any? ) || can?( :create, Switchboard ) %h2= t('switchboards.index.page_title') - if can?( :index, Switchboard ) && user.switchboards.count > 0 = render :partial => "switchboards/index_core", :locals => {:switchboards => user.switchboards, :user => user} -- cgit v1.2.3