Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-12-16 13:30:28 +01:00
Code Issues Packages Projects Releases Activity

use "do end" instead of {} at UsersController

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@20302 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2020-11-08 13:02:26 +00:00
parent 3ec47cc85a
commit 939f59a30f
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/controllers/users_controller.rb
View File

@@ -60,13 +60,13 @@ class UsersController < ApplicationController
@users = scope.order(sort_clause).limit(@limit).offset(@offset).to_a @users = scope.order(sort_clause).limit(@limit).offset(@offset).to_a
respond_to do |format| respond_to do |format|
format.html { format.html do
@groups = Group.givable.sort @groups = Group.givable.sort
render :layout => !request.xhr? render :layout => !request.xhr?
} end
format.csv { format.csv do
send_data(users_to_csv(scope.order(sort_clause)), :type => 'text/csv; header=present', :filename => 'users.csv') send_data(users_to_csv(scope.order(sort_clause)), :type => 'text/csv; header=present', :filename => 'users.csv')
} end
format.api format.api
end end
end end
@@ -91,11 +91,11 @@ class UsersController < ApplicationController
} }
respond_to do |format| respond_to do |format|
format.html { format.html do
events = Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 10) events = Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 10)
@events_by_day = events.group_by {|event| User.current.time_to_date(event.event_datetime)} @events_by_day = events.group_by {|event| User.current.time_to_date(event.event_datetime)}
render :layout => 'base' render :layout => 'base'
} end
format.api format.api
end end
end end
@@ -116,7 +116,7 @@ class UsersController < ApplicationController
Mailer.deliver_account_information(@user, @user.password) if params[:send_information] Mailer.deliver_account_information(@user, @user.password) if params[:send_information]
respond_to do |format| respond_to do |format|
format.html { format.html do
flash[:notice] = l(:notice_user_successful_create, :id => view_context.link_to(@user.login, user_path(@user))) flash[:notice] = l(:notice_user_successful_create, :id => view_context.link_to(@user.login, user_path(@user)))
if params[:continue] if params[:continue]
attrs = {:generate_password => @user.generate_password } attrs = {:generate_password => @user.generate_password }
@@ -124,7 +124,7 @@ class UsersController < ApplicationController
else else
redirect_to edit_user_path(@user) redirect_to edit_user_path(@user)
end end
} end
format.api { render :action => 'show', :status => :created, :location => user_url(@user) } format.api { render :action => 'show', :status => :created, :location => user_url(@user) }
end end
else else
@@ -164,10 +164,10 @@ class UsersController < ApplicationController
end end
respond_to do |format| respond_to do |format|
format.html { format.html do
flash[:notice] = l(:notice_successful_update) flash[:notice] = l(:notice_successful_update)
redirect_to_referer_or edit_user_path(@user) redirect_to_referer_or edit_user_path(@user)
} end
format.api { render_api_ok } format.api { render_api_ok }
end end
else else