Download as
Browse Code »

Commit 8efc035e82bfd2244a860463b6e2ffdf493c5de5

Authored by Leandro Santos
2 parents b8a9f0b9 3c7ef3f4
Exists in staging and in 1 other branch production

Merge branch 'master' into staging

Showing 7 changed files with 73 additions and 2 deletions   Show diff stats
app/api/app.rb
  Diff comments   View file @8efc035
... ... @@ -54,6 +54,7 @@ module Api
54 54 mount V1::Blocks
55 55 mount V1::Profiles
56 56 mount V1::Activities
  57 + mount V1::Roles
57 58  
58 59 # hook point which allow plugins to add Grape::API extensions to Api::App
59 60 #finds for plugins which has api mount points classes defined (the class should extends Grape::API)
... ...
app/api/entities.rb
  Diff comments   View file @8efc035
... ... @@ -267,6 +267,10 @@ module Api
267 267 expose :status
268 268 expose :created_at
269 269 expose :data
  270 + expose :accept_details
  271 + expose :reject_details
  272 + expose :accept_disabled?, as: :accept_disabled
  273 + expose :reject_disabled?, as: :reject_disabled
270 274 expose :target do |task, options|
271 275 type_map = {Profile => ::Profile, Environment => ::Environment}.find {|h| task.target.kind_of?(h.last)}
272 276 type_map.first.represent(task.target) unless type_map.nil?
... ... @@ -298,5 +302,12 @@ module Api
298 302 type_map.first.represent(activity.target) unless type_map.nil?
299 303 end
300 304 end
  305 +
  306 + class Role < Entity
  307 + root 'roles', 'role'
  308 + expose :id
  309 + expose :name
  310 + expose :key
  311 + end
301 312 end
302 313 end
... ...
app/api/v1/roles.rb 0 → 100644
  Diff comments   View file @8efc035
... ... @@ -0,0 +1,24 @@
  1 +module Api
  2 + module V1
  3 + class Roles < Grape::API
  4 + before { authenticate! }
  5 +
  6 + MAX_PER_PAGE = 50
  7 +
  8 + resource :organizations do
  9 + segment "/:organization_id" do
  10 + resource :roles do
  11 +
  12 + paginate max_per_page: MAX_PER_PAGE
  13 + get do
  14 + organization = environment.profiles.find(params[:organization_id])
  15 + roles = Profile::Roles.organization_roles(organization.environment.id, organization.id)
  16 + present_partial paginate(roles), with: Entities::Role
  17 + end
  18 +
  19 + end
  20 + end
  21 + end
  22 + end
  23 + end
  24 +end
... ...
app/models/profile.rb
  Diff comments   View file @8efc035
... ... @@ -90,6 +90,9 @@ class Profile &lt; ApplicationRecord
90 90 def self.organization_custom_roles(env_id, profile_id)
91 91 all_roles(env_id).where('profile_id = ?', profile_id)
92 92 end
  93 + def self.organization_roles(env_id, profile_id)
  94 + all_roles(env_id).where("profile_id = ? or key like 'profile_%'", profile_id)
  95 + end
93 96 def self.all_roles(env_id)
94 97 Role.where(environment_id: env_id)
95 98 end
... ...
app/views/tasks/_add_member_accept_details.html.erb
  Diff comments   View file @8efc035
1 1 <%= content = _("Roles:")+"<br />"
2   -roles = Profile::Roles.organization_member_roles(task.target.environment.id) + profile.custom_roles
  2 +roles = Profile::Roles.organization_roles(task.target.environment.id, profile.id)
3 3 roles.each do |role|
4 4 content += labelled_check_box(role.name, "tasks[#{task.id}][task][roles][]", role.id, false) + "<br />".html_safe
5 5 end
... ...
test/api/roles_test.rb 0 → 100644
  Diff comments   View file @8efc035
... ... @@ -0,0 +1,23 @@
  1 +require_relative 'test_helper'
  2 +
  3 +class TolesTest < ActiveSupport::TestCase
  4 +
  5 + def setup
  6 + create_and_activate_user
  7 + login_api
  8 + @environment = Environment.default
  9 + @profile = fast_create(Organization)
  10 + end
  11 +
  12 + attr_accessor :profile, :environment
  13 +
  14 + should 'list organization roles' do
  15 + environment.roles.delete_all
  16 + role1 = Role.create!(key: 'profile_administrator', name: 'admin', environment: environment)
  17 + role2 = Role.new(key: 'profile_moderator', name: 'moderator', environment: environment)
  18 + profile.custom_roles << role2
  19 + get "/api/v1/organizations/#{profile.id}/roles?#{params.to_query}"
  20 + json = JSON.parse(last_response.body)
  21 + assert_equivalent [role1.id, role2.id], json['roles'].map {|r| r['id']}
  22 + end
  23 +end
... ...
test/unit/profile_test.rb
  Diff comments   View file @8efc035
... ... @@ -1892,7 +1892,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
1892 1892 assert_includes Profile.communities, child
1893 1893 end
1894 1894  
1895   - should 'get organization roles' do
  1895 + should 'get organization member roles' do
1896 1896 env = fast_create(Environment)
1897 1897 roles = %w(foo bar profile_foo profile_bar).map{ |r| create(Role, :name => r, :key => r, :environment_id => env.id, :permissions => ["some"]) }
1898 1898 create Role, :name => 'test', :key => 'profile_test', :environment_id => env.id + 1
... ... @@ -1900,6 +1900,15 @@ class ProfileTest &lt; ActiveSupport::TestCase
1900 1900 assert_equal roles[2..3], Profile::Roles.organization_member_roles(env.id)
1901 1901 end
1902 1902  
  1903 + should 'get organization roles' do
  1904 + env = fast_create(Environment)
  1905 + env.roles.delete_all
  1906 + profile = fast_create(Organization)
  1907 + roles = %w(foo bar profile_foo profile_bar).map{ |r| create(Role, :name => r, :key => r, :environment_id => env.id, :permissions => ["some"]) }
  1908 + roles << create(Role, name: 'test', key: 'something_else', environment_id: env.id, profile_id: profile.id)
  1909 + assert_equal roles[2..4], Profile::Roles.organization_roles(env.id, profile.id)
  1910 + end
  1911 +
1903 1912 should 'get all roles' do
1904 1913 env = fast_create(Environment)
1905 1914 roles = %w(foo bar profile_foo profile_bar).map{ |r| create(Role, :name => r, :environment_id => env.id, :permissions => ["some"]) }
... ...