diff options
| author | spag <spag@golwen.net> | 2013-02-12 08:19:10 +0100 |
|---|---|---|
| committer | spag <spag@golwen.net> | 2013-02-12 08:19:10 +0100 |
| commit | 8e55bf891a0520ba241585d8295ccc37ed57b09e (patch) | |
| tree | df823d812586612de3a285e22a4cca52170a9b60 /app/models | |
| parent | d1145ad9d4f495d7416ed97e0dd3c17365990323 (diff) | |
| parent | 3d817bef265f70b147455db4b0fb5e1ca3c0d379 (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/ability.rb | 8 | ||||
| -rw-r--r-- | app/models/system_message.rb | 7 |
2 files changed, 0 insertions, 15 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb index 01f26aa..4c0844c 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -56,10 +56,6 @@ class Ability can :read, PhoneBookEntry, :phone_book => { :id => user_group.phone_book_ids } end - # SystemMessages - # - cannot [:destroy, :edit, :update], SystemMessage - # A FacDocument can't be changed # cannot [:edit, :update], FaxDocument @@ -160,10 +156,6 @@ class Ability # can :manage, CallForward, :phone_number_id => user.phone_number_ids - # SystemMessages - # - can :read, SystemMessage, :user_id => user.id - # SoftkeyFunctions # can :read, SoftkeyFunction diff --git a/app/models/system_message.rb b/app/models/system_message.rb deleted file mode 100644 index 0d9e862..0000000 --- a/app/models/system_message.rb +++ /dev/null @@ -1,7 +0,0 @@ -class SystemMessage < ActiveRecord::Base - attr_accessible :content - - belongs_to :user - - validates_presence_of :content -end |