From 968c95ea4938f80d84055b2a3aeb829c79d56cb7 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sun, 8 Nov 2020 13:02:34 +0000 Subject: [PATCH] use "do end" instead of {} at GroupsController git-svn-id: http://svn.redmine.org/redmine/trunk@20303 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/groups_controller.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 020931599..fb21e2f05 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -32,7 +32,7 @@ class GroupsController < ApplicationController def index respond_to do |format| - format.html { + format.html do scope = Group.sorted scope = scope.like(params[:name]) if params[:name].present? @@ -40,12 +40,12 @@ class GroupsController < ApplicationController @group_pages = Paginator.new @group_count, per_page_option, params['page'] @groups = scope.limit(@group_pages.per_page).offset(@group_pages.offset).to_a @user_count_by_group_id = user_count_by_group_id - } - format.api { + end + format.api do scope = Group.sorted scope = scope.givable unless params[:builtin] == '1' @groups = scope.to_a - } + end end end @@ -117,13 +117,13 @@ class GroupsController < ApplicationController respond_to do |format| format.html { redirect_to edit_group_path(@group, :tab => 'users') } format.js - format.api { + format.api do if @users.any? render_api_ok else render_api_errors "#{l(:label_user)} #{l('activerecord.errors.messages.invalid')}" end - } + end end end -- 2.39.5