summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
Diffstat (limited to 'app/models')
-rw-r--r--app/models/ability.rb3
-rw-r--r--app/models/phone_book_entry.rb2
2 files changed, 3 insertions, 2 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 0fa40c8..cd91a8a 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -74,9 +74,10 @@ class Ability
cannot :manage, PhoneNumberRange
end
- # GsParameter can't be created or deleted via the GUI
+ # GsParameter and GuiFunction can't be created or deleted via the GUI
#
cannot [:create, :destroy], GsParameter
+ cannot [:create, :destroy], GuiFunction
else
# Any user can do the following stuff.
#
diff --git a/app/models/phone_book_entry.rb b/app/models/phone_book_entry.rb
index db2b44b..275c7b6 100644
--- a/app/models/phone_book_entry.rb
+++ b/app/models/phone_book_entry.rb
@@ -6,7 +6,7 @@ class PhoneBookEntry < ActiveRecord::Base
attr_accessible :first_name, :middle_name, :last_name, :title, :nickname, :organization, :is_organization, :department, :job_title, :is_male, :birthday, :birth_name, :description, :homepage_personal, :homepage_organization, :twitter_account, :facebook_account, :google_plus_account, :xing_account, :linkedin_account, :mobileme_account, :image
- belongs_to :phone_book
+ belongs_to :phone_book, :touch => true
has_many :conference_invitees, :dependent => :destroy
acts_as_list :scope => :phone_book