diff options
| author | Peter Kozak <spag@golwen.net> | 2013-03-11 02:43:51 -0400 |
|---|---|---|
| committer | Peter Kozak <spag@golwen.net> | 2013-03-11 02:43:51 -0400 |
| commit | 436368d7719a9447c5c09dc6f8b24a623b48f3b6 (patch) | |
| tree | c288f4c91d7937303f5f2553c60aa16062bcab73 /app/views/users | |
| parent | 0c5c2bc651bc701117d376a68905cb7d2f913449 (diff) | |
| parent | beb9e66a5b4e2744435f2c1f301828b68a58c96a (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/views/users')
| -rw-r--r-- | app/views/users/_switchboards.html.haml | 7 | ||||
| -rw-r--r-- | app/views/users/show.html.haml | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/app/views/users/_switchboards.html.haml b/app/views/users/_switchboards.html.haml new file mode 100644 index 0000000..183b6ae --- /dev/null +++ b/app/views/users/_switchboards.html.haml @@ -0,0 +1,7 @@ +-# Switchboards +-# +- 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} + = render :partial => 'shared/create_link', :locals => {:parent => user, :child_class => Switchboard}
\ 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 |