diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-11 14:43:13 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-11 14:43:13 +0100 |
| commit | f1e7f17befcb5c9f7d6d10a27cbe06c8482dbe2b (patch) | |
| tree | a6bce5a8df0c053689da41d4f0fcf1133ace1018 /app/models | |
| parent | 62ac01a8ea536718734bd911fc3642c0bd8b6bc7 (diff) | |
| parent | ca8121930d7e75b9f6bac08591c6ffea3ca1fea1 (diff) | |
Merge branch 'private_pub' 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 |