diff options
| author | Peter Kozak <spag@golwen.net> | 2013-02-27 06:05:06 -0500 |
|---|---|---|
| committer | Peter Kozak <spag@golwen.net> | 2013-02-27 06:05:06 -0500 |
| commit | 211f558a86ae30cdd5b392ab1376e1393f97e22c (patch) | |
| tree | f86ec6cedf081a1a57005eca1661e9bead34e4de /app | |
| parent | ed0117210837dd1d0d2dbf403799b70225caf0cd (diff) | |
| parent | 41e17e9f3e184975e8b429d3fb06d822c49068bf (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/sip_accounts_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/ability.rb | 5 | ||||
| -rw-r--r-- | app/views/layouts/_navbar.html.haml | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/app/controllers/sip_accounts_controller.rb b/app/controllers/sip_accounts_controller.rb index ef1aab8..621bd3c 100644 --- a/app/controllers/sip_accounts_controller.rb +++ b/app/controllers/sip_accounts_controller.rb @@ -1,7 +1,7 @@ class SipAccountsController < ApplicationController load_resource :user load_resource :tenant - load_resource :sip_account, :only => [:call] + load_and_authorize_resource :sip_account, :only => [:call] load_and_authorize_resource :sip_account, :through => [:user, :tenant ] before_filter :set_and_authorize_parent diff --git a/app/models/ability.rb b/app/models/ability.rb index be64528..3ba4481 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -90,6 +90,11 @@ class Ability # SIM cards # cannot [:edit, :update], SimCard + + # Restore is only possible on a new system. + # + cannot :manage, RestoreJob + else # Any user can do the following stuff. # diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml index a7f47cf..8004c0e 100644 --- a/app/views/layouts/_navbar.html.haml +++ b/app/views/layouts/_navbar.html.haml @@ -3,10 +3,12 @@ .container %span.hidden-phone %a.brand{:href => (current_user.nil? ? '/' : tenant_path(current_user.current_tenant))} - Gemeinschaft 5 + Gemeinschaft 5.1 .nav-collapse.collapse %ul.nav + - if !GemeinschaftSetup.any? + %li=link_to t('restore_jobs.new.page_title'), new_restore_job_path - if current_user && GemeinschaftSetup.any? && current_user.admin? - if current_page?(page_help_path) %li.active |