jro_apps/redmine Commit - r6747:b21374891d3f

remove trailing white-spaces from app/controllers/users_controller.rb....

Toshi MARUYAMA -

r6747:b21374891d3f

parent child

Context file:

r6747:b21374891d3f

Collapse all files

app/controllers/users_controller.rb +21 -21

              # modify it under the terms of the GNU General Public License
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
+             #
+             #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
+             #
+             #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              class UsersController < ApplicationController
                layout 'admin'
                before_filter :require_admin, :except => :show
                before_filter :find_user, :only => [:show, :edit, :update, :destroy, :edit_membership, :destroy_membership]
                accept_api_auth :index, :show, :create, :update, :destroy
                helper :sort
                include SortHelper
                helper :custom_fields
-               include CustomFieldsHelper
+               include CustomFieldsHelper
                def index
                  sort_init 'login', 'asc'
                  sort_update %w(login firstname lastname mail admin created_on last_login_on)
                  case params[:format]
                  when 'xml', 'json'
                    @offset, @limit = api_offset_and_limit
                  else
                    @limit = per_page_option
                  end
                  scope = User
                  scope = scope.in_group(params[:group_id].to_i) if params[:group_id].present?
                  @status = params[:status] ? params[:status].to_i : 1
                  c = ARCondition.new(@status == 0 ? "status <> 0" : ["status = ?", @status])
                    name = "%#{params[:name].strip.downcase}%"
                    c << ["LOWER(login) LIKE ? OR LOWER(firstname) LIKE ? OR LOWER(lastname) LIKE ? OR LOWER(mail) LIKE ?", name, name, name, name]
                  end
                  @user_count = scope.count(:conditions => c.conditions)
                  @user_pages = Paginator.new self, @user_count, @limit, params['page']
                  @offset ||= @user_pages.current.offset
                    format.api
                  end
                end
                def show
                  # show projects based on current user visibility
                  @memberships = @user.memberships.all(:conditions => Project.visible_condition(User.current))
                  events = Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 10)
                  @events_by_day = events.group_by(&:event_date)
                  unless User.current.admin?
                    if !@user.active? || (@user != User.current  && @memberships.empty? && events.empty?)
                      render_404
                      return
                    end
                  end
                  respond_to do |format|
                    format.html { render :layout => 'base' }
                    format.api
                  @user = User.new(:language => Setting.default_language, :mail_notification => Setting.default_notification_option)
                  @auth_sources = AuthSource.find(:all)
                end
                verify :method => :post, :only => :create, :render => {:nothing => true, :status => :method_not_allowed }
                def create
                  @user = User.new(:language => Setting.default_language, :mail_notification => Setting.default_notification_option)
                    @user.notified_project_ids = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : [])
                    Mailer.deliver_account_information(@user, params[:user][:password]) if params[:send_information]
                    respond_to do |format|
                      format.html {
                        flash[:notice] = l(:notice_successful_create)
-                       redirect_to(params[:continue] ?
-                         {:controller => 'users', :action => 'new'} :
+                       redirect_to(params[:continue] ?
+                         {:controller => 'users', :action => 'new'} :
                          {:controller => 'users', :action => 'edit', :id => @user}
                        )
                      }
                  @auth_sources = AuthSource.find(:all)
                  @membership ||= Member.new
                end
                verify :method => :put, :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
                def update
                  @user.admin = params[:user][:admin] if params[:user][:admin]
                    elsif @user.active? && params[:send_information] && !params[:user][:password].blank? && @user.auth_source_id.nil?
                      Mailer.deliver_account_information(@user, params[:user][:password])
                    end
                    respond_to do |format|
                      format.html {
                        flash[:notice] = l(:notice_successful_update)
                    end
                  end
                end
                def destroy_membership
                  @membership = Member.find(params[:membership_id])
                  if request.post? && @membership.deletable?
                    format.js { render(:update) {|page| page.replace_html "tab-content-memberships", :partial => 'users/memberships'} }
                  end
                end
                private
                def find_user
                  if params[:id] == 'current'
                    require_login || return

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages