diff options
author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-03-04 11:55:33 +0100 |
---|---|---|
committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-03-04 11:55:33 +0100 |
commit | a07b7482bb2f9d2867dafc909da8af90d5ee9143 (patch) | |
tree | 360e5a8b3cc1f9c0ccf79575709b0a9787924dd3 /app/models | |
parent | aaffa89ef9aef6ac30e3304d735a8c58f4bdaaef (diff) | |
parent | 8042e6c314737feab61209e0b8b26ddba5c7e763 (diff) |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/group_permission.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/group_permission.rb b/app/models/group_permission.rb index fe988ba..c859f52 100644 --- a/app/models/group_permission.rb +++ b/app/models/group_permission.rb @@ -1,7 +1,7 @@ class GroupPermission < ActiveRecord::Base attr_accessible :group_id, :permission, :target_group_id - PERMISSION_TYPES = ['pickup'] + PERMISSION_TYPES = ['pickup', 'presence'] belongs_to :group belongs_to :target_group, :class_name => "Group" |