From c69b8e04591907d030b2cd544a606fd0e576116a Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sun, 14 Sep 2014 19:32:51 +0300 Subject: Huge replace of old users_project and users_group references Signed-off-by: Dmitriy Zaporozhets --- lib/api/entities.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/api/entities.rb') diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 74fdef93543..d012a6056f5 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -54,7 +54,7 @@ module API class ProjectMember < UserBasic expose :project_access, as: :access_level do |user, options| - options[:project].users_projects.find_by(user_id: user.id).project_access + options[:project].project_members.find_by(user_id: user.id).project_access end end @@ -68,7 +68,7 @@ module API class GroupMember < UserBasic expose :group_access, as: :access_level do |user, options| - options[:group].users_groups.find_by(user_id: user.id).group_access + options[:group].group_members.find_by(user_id: user.id).group_access end end @@ -182,12 +182,12 @@ module API class ProjectWithAccess < Project expose :permissions do expose :project_access, using: Entities::ProjectAccess do |project, options| - project.users_projects.find_by(user_id: options[:user].id) + project.project_members.find_by(user_id: options[:user].id) end expose :group_access, using: Entities::GroupAccess do |project, options| if project.group - project.group.users_groups.find_by(user_id: options[:user].id) + project.group.group_members.find_by(user_id: options[:user].id) end end end -- cgit v1.2.1 From ce49f035cfccc9cb2e86b986b8a69b18fcc9cadc Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 15 Sep 2014 11:55:36 +0300 Subject: Fix access_level api Signed-off-by: Dmitriy Zaporozhets --- lib/api/entities.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/api/entities.rb') diff --git a/lib/api/entities.rb b/lib/api/entities.rb index d012a6056f5..4b14472fd5c 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -53,8 +53,8 @@ module API end class ProjectMember < UserBasic - expose :project_access, as: :access_level do |user, options| - options[:project].project_members.find_by(user_id: user.id).project_access + expose :access_level do |user, options| + options[:project].project_members.find_by(user_id: user.id).access_level end end @@ -67,7 +67,7 @@ module API end class GroupMember < UserBasic - expose :group_access, as: :access_level do |user, options| + expose :access_level do |user, options| options[:group].group_members.find_by(user_id: user.id).group_access end end @@ -170,12 +170,12 @@ module API end class ProjectAccess < Grape::Entity - expose :project_access, as: :access_level + expose :access_level expose :notification_level end class GroupAccess < Grape::Entity - expose :group_access, as: :access_level + expose :access_level expose :notification_level end -- cgit v1.2.1 From 4f1bb91a75111188ce52e8fde1c3ac0acfff452e Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 15 Sep 2014 16:45:28 +0300 Subject: Fix finder and tests for new membership models Signed-off-by: Dmitriy Zaporozhets --- lib/api/entities.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/api/entities.rb') diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 4b14472fd5c..ffa3e8a149e 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -68,7 +68,7 @@ module API class GroupMember < UserBasic expose :access_level do |user, options| - options[:group].group_members.find_by(user_id: user.id).group_access + options[:group].group_members.find_by(user_id: user.id).access_level end end -- cgit v1.2.1