summaryrefslogtreecommitdiffstats
path: root/app/controllers/groups_controller.rb
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2021-07-19 14:42:26 +0000
committerGo MAEDA <maeda@farend.jp>2021-07-19 14:42:26 +0000
commit482656fb2c09e9e456a3e006ceaf78d0c6f33ee5 (patch)
tree616b059cb0a94297a0a079a4b53a9218cccf2e2f /app/controllers/groups_controller.rb
parent8e4d71adc9ebcfa48d7fcff388cc68661c03eaa2 (diff)
downloadredmine-482656fb2c09e9e456a3e006ceaf78d0c6f33ee5.tar.gz
redmine-482656fb2c09e9e456a3e006ceaf78d0c6f33ee5.zip
Allow non-admin users to see group members (#12795).
Patch by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/trunk@21072 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/groups_controller.rb')
-rw-r--r--app/controllers/groups_controller.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index f6358080b..0ca636e19 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -21,7 +21,7 @@ class GroupsController < ApplicationController
layout 'admin'
self.main_menu = false
- before_action :require_admin
+ before_action :require_admin, :except => [:show]
before_action :find_group, :except => [:index, :new, :create]
accept_api_auth :index, :show, :create, :update, :destroy, :add_users, :remove_user
@@ -50,8 +50,12 @@ class GroupsController < ApplicationController
end
def show
+ return render_404 unless @group.visible?
+
respond_to do |format|
- format.html
+ format.html do
+ render :layout => 'base'
+ end
format.api
end
end