diff options
| author | Mario "Kuroir" Ricalde <kuroir@gmail.com> | 2013-03-05 11:01:01 -0600 |
|---|---|---|
| committer | Mario "Kuroir" Ricalde <kuroir@gmail.com> | 2013-03-05 11:01:01 -0600 |
| commit | 4fcdd330139921b6fa5d4f9d15fb5f91775b27af (patch) | |
| tree | 62e82c385c9a804a8f32da6f276881ff8c21fc90 /app/models/group_permission.rb | |
| parent | 2b94b16ee1201d15b3b9d66e142df311141a47db (diff) | |
| parent | a865b1f9506b900ed8643c01d94c86268e907720 (diff) | |
Merge remote-tracking branch 'origin/develop' into develop
Diffstat (limited to 'app/models/group_permission.rb')
| -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" |