jro_apps/redmine Commit - r9229:18270ee5879b

Code cleanup....

Jean-Philippe Lang -

r9229:18270ee5879b

parent child

Context file:

r9229:18270ee5879b

Collapse all files

app/controllers/application_controller.rb +13 0

              # Redmine - project management software
              # Copyright (C) 2006-2011  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # 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.
              require 'uri'
              require 'cgi'
              class Unauthorized < Exception; end
              class ApplicationController < ActionController::Base
                include Redmine::I18n
                layout 'base'
                exempt_from_layout 'builder', 'rsb'
                protect_from_forgery
                def handle_unverified_request
                  super
                  cookies.delete(:autologin)
                end
                # Remove broken cookie after upgrade from 0.8.x (#4292)
                # See https://rails.lighthouseapp.com/projects/8994/tickets/3360
                # TODO: remove it when Rails is fixed
                before_filter :delete_broken_cookies
                def delete_broken_cookies
                  if cookies['_redmine_session'] && cookies['_redmine_session'] !~ /--/
                    cookies.delete '_redmine_session'
                    redirect_to home_path
                    return false
                  end
                end
                # FIXME: Remove this when all of Rack and Rails have learned how to
                # properly use encodings
                before_filter :params_filter
                def params_filter
                  if RUBY_VERSION >= '1.9' && defined?(Rails) && Rails::VERSION::MAJOR < 3
                    self.utf8nize!(params)
                  end
                end
                def utf8nize!(obj)
                  if obj.frozen?
                    obj
                  elsif obj.is_a? String
                    obj.respond_to?(:force_encoding) ? obj.force_encoding("UTF-8") : obj
                  elsif obj.is_a? Hash
                    obj.each {|k, v| obj[k] = self.utf8nize!(v)}
                  elsif obj.is_a? Array
                    obj.each {|v| self.utf8nize!(v)}
                  else
                    obj
                  end
                end
                before_filter :user_setup, :check_if_login_required, :set_localization
                filter_parameter_logging :password
                rescue_from ActionController::InvalidAuthenticityToken, :with => :invalid_authenticity_token
                rescue_from ::Unauthorized, :with => :deny_access
                include Redmine::Search::Controller
                include Redmine::MenuManager::MenuController
                helper Redmine::MenuManager::MenuHelper
                Redmine::Scm::Base.all.each do |scm|
                  require_dependency "repository/#{scm.underscore}"
                end
                def user_setup
                  # Check the settings cache for each request
                  Setting.check_cache
                  # Find the current user
                  User.current = find_current_user
                end
                # Returns the current user or nil if no user is logged in
                # and starts a session if needed
                def find_current_user
                  if session[:user_id]
                    # existing session
                    (User.active.find(session[:user_id]) rescue nil)
                  elsif cookies[:autologin] && Setting.autologin?
                    # auto-login feature starts a new session
                    user = User.try_to_autologin(cookies[:autologin])
                    session[:user_id] = user.id if user
                    user
                  elsif params[:format] == 'atom' && params[:key] && request.get? && accept_rss_auth?
                    # RSS key authentication does not start a session
                    User.find_by_rss_key(params[:key])
                  elsif Setting.rest_api_enabled? && accept_api_auth?
                    if (key = api_key_from_request)
                      # Use API key
                      User.find_by_api_key(key)
                    else
                      # HTTP Basic, either username/password or API key/random
                      authenticate_with_http_basic do |username, password|
                        User.try_to_login(username, password) || User.find_by_api_key(username)
                      end
                    end
                  end
                end
                # Sets the logged in user
                def logged_user=(user)
                  reset_session
                  if user && user.is_a?(User)
                    User.current = user
                    session[:user_id] = user.id
                  else
                    User.current = User.anonymous
                  end
                end
                # check if login is globally required to access the application
                def check_if_login_required
                  # no check needed if user is already logged in
                  return true if User.current.logged?
                  require_login if Setting.login_required?
                end
                def set_localization
                  lang = nil
                  if User.current.logged?
                    lang = find_language(User.current.language)
                  end
                  if lang.nil? && request.env['HTTP_ACCEPT_LANGUAGE']
                    accept_lang = parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first
                    if !accept_lang.blank?
                      accept_lang = accept_lang.downcase
                      lang = find_language(accept_lang) || find_language(accept_lang.split('-').first)
                    end
                  end
                  lang ||= Setting.default_language
                  set_language_if_valid(lang)
                end
                def require_login
                  if !User.current.logged?
                    # Extract only the basic url parameters on non-GET requests
                    if request.get?
                      url = url_for(params)
                    else
                      url = url_for(:controller => params[:controller], :action => params[:action], :id => params[:id], :project_id => params[:project_id])
                    end
                    respond_to do |format|
                      format.html { redirect_to :controller => "account", :action => "login", :back_url => url }
                      format.atom { redirect_to :controller => "account", :action => "login", :back_url => url }
                      format.xml  { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"' }
                      format.js   { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"' }
                      format.json { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"' }
                    end
                    return false
                  end
                  true
                end
                def require_admin
                  return unless require_login
                  if !User.current.admin?
                    render_403
                    return false
                  end
                  true
                end
                def deny_access
                  User.current.logged? ? render_403 : require_login
                end
                # Authorize the user for the requested action
                def authorize(ctrl = params[:controller], action = params[:action], global = false)
                  allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project || @projects, :global => global)
                  if allowed
                    true
                  else
                    if @project && @project.archived?
                      render_403 :message => :notice_not_authorized_archived_project
                    else
                      deny_access
                    end
                  end
                end
                # Authorize the user for the requested action outside a project
                def authorize_global(ctrl = params[:controller], action = params[:action], global = true)
                  authorize(ctrl, action, global)
                end
                # Find project of id params[:id]
                def find_project
                  @project = Project.find(params[:id])
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                # Find project of id params[:project_id]
                def find_project_by_project_id
                  @project = Project.find(params[:project_id])
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                # Find a project based on params[:project_id]
                # TODO: some subclasses override this, see about merging their logic
                def find_optional_project
                  @project = Project.find(params[:project_id]) unless params[:project_id].blank?
                  allowed = User.current.allowed_to?({:controller => params[:controller], :action => params[:action]}, @project, :global => true)
                  allowed ? true : deny_access
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                # Finds and sets @project based on @object.project
                def find_project_from_association
                  render_404 unless @object.present?
                  @project = @object.project
                end
                def find_model_object
                  model = self.class.read_inheritable_attribute('model_object')
                  if model
                    @object = model.find(params[:id])
                    self.instance_variable_set('@' + controller_name.singularize, @object) if @object
                  end
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def self.model_object(model)
                  write_inheritable_attribute('model_object', model)
                end
                # Filter for bulk issue operations
                def find_issues
                  @issues = Issue.find_all_by_id(params[:id] || params[:ids])
                  raise ActiveRecord::RecordNotFound if @issues.empty?
                  if @issues.detect {|issue| !issue.visible?}
                    deny_access
                    return
                  end
                  @projects = @issues.collect(&:project).compact.uniq
                  @project = @projects.first if @projects.size == 1
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                # make sure that the user is a member of the project (or admin) if project is private
                # used as a before_filter for actions that do not require any particular permission on the project
                def check_project_privacy
                  if @project && @project.active?
                    if @project.visible?
                      true
                    else
                      deny_access
                    end
                  else
                    @project = nil
                    render_404
                    false
                  end
                end
                def back_url
                  params[:back_url] || request.env['HTTP_REFERER']
                end
                def redirect_back_or_default(default)
                  back_url = CGI.unescape(params[:back_url].to_s)
                  if !back_url.blank?
                    begin
                      uri = URI.parse(back_url)
                      # do not redirect user to another host or to the login or register page
                      if (uri.relative? || (uri.host == request.host)) && !uri.path.match(%r{/(login|account/register)})
                        redirect_to(back_url)
                        return
                      end
                    rescue URI::InvalidURIError
                      # redirect to default
                    end
                  end
                  redirect_to default
                  false
                end
+               # Redirects to the request referer if present, redirects to args or call block otherwise.
+               def redirect_to_referer_or(*args, &block)
+                 redirect_to :back
+               rescue ::ActionController::RedirectBackError
+                 if args.any?
+                   redirect_to *args
+                 elsif block_given?
+                   block.call
+                 else
+                   raise "#redirect_to_referer_or takes arguments or a block"
+                 end
+               end
                def render_403(options={})
                  @project = nil
                  render_error({:message => :notice_not_authorized, :status => 403}.merge(options))
                  return false
                end
                def render_404(options={})
                  render_error({:message => :notice_file_not_found, :status => 404}.merge(options))
                  return false
                end
                # Renders an error response
                def render_error(arg)
                  arg = {:message => arg} unless arg.is_a?(Hash)
                  @message = arg[:message]
                  @message = l(@message) if @message.is_a?(Symbol)
                  @status = arg[:status] || 500
                  respond_to do |format|
                    format.html {
                      render :template => 'common/error', :layout => use_layout, :status => @status
                    }
                    format.atom { head @status }
                    format.xml { head @status }
                    format.js { head @status }
                    format.json { head @status }
                  end
                end
                # Filter for actions that provide an API response
                # but have no HTML representation for non admin users
                def require_admin_or_api_request
                  return true if api_request?
                  if User.current.admin?
                    true
                  elsif User.current.logged?
                    render_error(:status => 406)
                  else
                    deny_access
                  end
                end
                # Picks which layout to use based on the request
                #
                # @return [boolean, string] name of the layout to use or false for no layout
                def use_layout
                  request.xhr? ? false : 'base'
                end
                def invalid_authenticity_token
                  if api_request?
                    logger.error "Form authenticity token is missing or is invalid. API calls must include a proper Content-type header (text/xml or text/json)."
                  end
                  render_error "Invalid form authenticity token."
                end
                def render_feed(items, options={})
                  @items = items || []
                  @items.sort! {|x,y| y.event_datetime <=> x.event_datetime }
                  @items = @items.slice(0, Setting.feeds_limit.to_i)
                  @title = options[:title] || Setting.app_title
                  render :template => "common/feed.atom", :layout => false,
                         :content_type => 'application/atom+xml'
                end
                # TODO: remove in Redmine 1.4
                def self.accept_key_auth(*actions)
                  ActiveSupport::Deprecation.warn "ApplicationController.accept_key_auth is deprecated and will be removed in Redmine 1.4. Use accept_rss_auth (or accept_api_auth) instead."
                  accept_rss_auth(*actions)
                end
                # TODO: remove in Redmine 1.4
                def accept_key_auth_actions
                  ActiveSupport::Deprecation.warn "ApplicationController.accept_key_auth_actions is deprecated and will be removed in Redmine 1.4. Use accept_rss_auth (or accept_api_auth) instead."
                  self.class.accept_rss_auth
                end
                def self.accept_rss_auth(*actions)
                  if actions.any?
                    write_inheritable_attribute('accept_rss_auth_actions', actions)
                  else
                    read_inheritable_attribute('accept_rss_auth_actions') || []
                  end
                end
                def accept_rss_auth?(action=action_name)
                  self.class.accept_rss_auth.include?(action.to_sym)
                end
                def self.accept_api_auth(*actions)
                  if actions.any?
                    write_inheritable_attribute('accept_api_auth_actions', actions)
                  else
                    read_inheritable_attribute('accept_api_auth_actions') || []
                  end
                end
                def accept_api_auth?(action=action_name)
                  self.class.accept_api_auth.include?(action.to_sym)
                end
                # Returns the number of objects that should be displayed
                # on the paginated list
                def per_page_option
                  per_page = nil
                  if params[:per_page] && Setting.per_page_options_array.include?(params[:per_page].to_s.to_i)
                    per_page = params[:per_page].to_s.to_i
                    session[:per_page] = per_page
                  elsif session[:per_page]
                    per_page = session[:per_page]
                  else
                    per_page = Setting.per_page_options_array.first || 25
                  end
                  per_page
                end
                # Returns offset and limit used to retrieve objects
                # for an API response based on offset, limit and page parameters
                def api_offset_and_limit(options=params)
                  if options[:offset].present?
                    offset = options[:offset].to_i
                    if offset < 0
                      offset = 0
                    end
                  end
                  limit = options[:limit].to_i
                  if limit < 1
                    limit = 25
                  elsif limit > 100
                    limit = 100
                  end
                  if offset.nil? && options[:page].present?
                    offset = (options[:page].to_i - 1) * limit
                    offset = 0 if offset < 0
                  end
                  offset ||= 0
                  [offset, limit]
                end
                # qvalues http header parser
                # code taken from webrick
                def parse_qvalues(value)
                  tmp = []
                  if value
                    parts = value.split(/,\s*/)
                    parts.each {|part|
                      if m = %r{^([^\s,]+?)(?:;\s*q=(\d+(?:\.\d+)?))?$}.match(part)
                        val = m[1]
                        q = (m[2] or 1).to_f
                        tmp.push([val, q])
                      end
                    }
                    tmp = tmp.sort_by{|val, q| -q}
                    tmp.collect!{|val, q| val}
                  end
                  return tmp
                rescue
                  nil
                end
                # Returns a string that can be used as filename value in Content-Disposition header
                def filename_for_content_disposition(name)
                  request.env['HTTP_USER_AGENT'] =~ %r{MSIE} ? ERB::Util.url_encode(name) : name
                end
                def api_request?
                  %w(xml json).include? params[:format]
                end
                # Returns the API key present in the request
                def api_key_from_request
                  if params[:key].present?
                    params[:key]
                  elsif request.headers["X-Redmine-API-Key"].present?
                    request.headers["X-Redmine-API-Key"]
                  end
                end
                # Renders a warning flash if obj has unsaved attachments
                def render_attachment_warning_if_needed(obj)
                  flash[:warning] = l(:warning_attachments_not_saved, obj.unsaved_attachments.size) if obj.unsaved_attachments.present?
                end
                # Sets the `flash` notice or error based the number of issues that did not save
                #
                # @param [Array, Issue] issues all of the saved and unsaved Issues
                # @param [Array, Integer] unsaved_issue_ids the issue ids that were not saved
                def set_flash_from_bulk_issue_save(issues, unsaved_issue_ids)
                  if unsaved_issue_ids.empty?
                    flash[:notice] = l(:notice_successful_update) unless issues.empty?
                  else
                    flash[:error] = l(:notice_failed_to_save_issues,
                                      :count => unsaved_issue_ids.size,
                                      :total => issues.size,
                                      :ids => '#' + unsaved_issue_ids.join(', #'))
                  end
                end
                # Rescues an invalid query statement. Just in case...
                def query_statement_invalid(exception)
                  logger.error "Query::StatementInvalid: #{exception.message}" if logger
                  session.delete(:query)
                  sort_clear if respond_to?(:sort_clear)
                  render_error "An error occurred while executing the query and has been logged. Please report this error to your Redmine administrator."
                end
                # Renders API response on validation failure
                def render_validation_errors(objects)
                  if objects.is_a?(Array)
                    @error_messages = objects.map {|object| object.errors.full_messages}.flatten
                  else
                    @error_messages = objects.errors.full_messages
                  end
                  render :template => 'common/error_messages.api', :status => :unprocessable_entity, :layout => false
                end
                # Overrides #default_template so that the api template
                # is used automatically if it exists
                def default_template(action_name = self.action_name)
                  if api_request?
                    begin
                      return self.view_paths.find_template(default_template_name(action_name), 'api')
                    rescue ::ActionView::MissingTemplate
                      # the api template was not found
                      # fallback to the default behaviour
                    end
                  end
                  super
                end
                # Overrides #pick_layout so that #render with no arguments
                # doesn't use the layout for api requests
                def pick_layout(*args)
                  api_request? ? nil : super
                end
              end

app/controllers/attachments_controller.rb +1 -3

              # Redmine - project management software
              # Copyright (C) 2006-2011  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # 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 AttachmentsController < ApplicationController
                before_filter :find_project, :except => :upload
                before_filter :file_readable, :read_authorize, :only => [:show, :download]
                before_filter :delete_authorize, :only => :destroy
                before_filter :authorize_global, :only => :upload
                accept_api_auth :show, :download, :upload
                def show
                  respond_to do |format|
                    format.html {
                      if @attachment.is_diff?
                        @diff = File.new(@attachment.diskfile, "rb").read
                        @diff_type = params[:type] || User.current.pref[:diff_type] || 'inline'
                        @diff_type = 'inline' unless %w(inline sbs).include?(@diff_type)
                        # Save diff type as user preference
                        if User.current.logged? && @diff_type != User.current.pref[:diff_type]
                          User.current.pref[:diff_type] = @diff_type
                          User.current.preference.save
                        end
                        render :action => 'diff'
                      elsif @attachment.is_text? && @attachment.filesize <= Setting.file_max_size_displayed.to_i.kilobyte
                        @content = File.new(@attachment.diskfile, "rb").read
                        render :action => 'file'
                      else
                        download
                      end
                    }
                    format.api
                  end
                end
                def download
                  if @attachment.container.is_a?(Version) || @attachment.container.is_a?(Project)
                    @attachment.increment_download
                  end
                  # images are sent inline
                  send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
                                                  :type => detect_content_type(@attachment),
                                                  :disposition => (@attachment.image? ? 'inline' : 'attachment')
                end
                def upload
                  # Make sure that API users get used to set this content type
                  # as it won't trigger Rails' automatic parsing of the request body for parameters
                  unless request.content_type == 'application/octet-stream'
                    render :nothing => true, :status => 406
                    return
                  end
                  @attachment = Attachment.new(:file => request.body)
                  @attachment.author = User.current
                  @attachment.filename = Redmine::Utils.random_hex(16)
                  if @attachment.save
                    respond_to do |format|
                      format.api { render :action => 'upload', :status => :created }
                    end
                  else
                    respond_to do |format|
                      format.api { render_validation_errors(@attachment) }
                    end
                  end
                end
                def destroy
                  if @attachment.container.respond_to?(:init_journal)
                    @attachment.container.init_journal(User.current)
                  end
                  # Make sure association callbacks are called
                  @attachment.container.attachments.delete(@attachment)
-                 redirect_to :back
-               rescue ::ActionController::RedirectBackError
-                 redirect_to :controller => 'projects', :action => 'show', :id => @project
+                 redirect_back_or_default project_path(@project)
                end
              private
                def find_project
                  @attachment = Attachment.find(params[:id])
                  # Show 404 if the filename in the url is wrong
                  raise ActiveRecord::RecordNotFound if params[:filename] && params[:filename] != @attachment.filename
                  @project = @attachment.project
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                # Checks that the file exists and is readable
                def file_readable
                  @attachment.readable? ? true : render_404
                end
                def read_authorize
                  @attachment.visible? ? true : deny_access
                end
                def delete_authorize
                  @attachment.deletable? ? true : deny_access
                end
                def detect_content_type(attachment)
                  content_type = attachment.content_type
                  if content_type.blank?
                    content_type = Redmine::MimeType.of(attachment.filename)
                  end
                  content_type.to_s
                end
              end

app/controllers/users_controller.rb +1 -3

              # Redmine - project management software
              # Copyright (C) 2006-2011  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # 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
                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
                  @status = params[:status] || 1
                  scope = User.logged.status(@status)
                  scope = scope.like(params[:name]) if params[:name].present?
                  scope = scope.in_group(params[:group_id]) if params[:group_id].present?
                  @user_count = scope.count
                  @user_pages = Paginator.new self, @user_count, @limit, params['page']
                  @offset ||= @user_pages.current.offset
                  @users =  scope.find :all,
                                      :order => sort_clause,
                                      :limit  =>  @limit,
                                      :offset =>  @offset
                  respond_to do |format|
                    format.html {
                      @groups = Group.all.sort
                      render :layout => !request.xhr?
                    }
                    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
                  end
                end
                def new
                  @user = User.new(:language => Setting.default_language, :mail_notification => Setting.default_notification_option)
                  @auth_sources = AuthSource.find(:all)
                end
                def create
                  @user = User.new(:language => Setting.default_language, :mail_notification => Setting.default_notification_option)
                  @user.safe_attributes = params[:user]
                  @user.admin = params[:user][:admin] || false
                  @user.login = params[:user][:login]
                  @user.password, @user.password_confirmation = params[:user][:password], params[:user][:password_confirmation] unless @user.auth_source_id
                  if @user.save
                    @user.pref.attributes = params[:pref]
                    @user.pref[:no_self_notified] = (params[:no_self_notified] == '1')
                    @user.pref.save
                    @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'} :
                          {:controller => 'users', :action => 'edit', :id => @user}
                        )
                      }
                      format.api  { render :action => 'show', :status => :created, :location => user_url(@user) }
                    end
                  else
                    @auth_sources = AuthSource.find(:all)
                    # Clear password input
                    @user.password = @user.password_confirmation = nil
                    respond_to do |format|
                      format.html { render :action => 'new' }
                      format.api  { render_validation_errors(@user) }
                    end
                  end
                end
                def edit
                  @auth_sources = AuthSource.find(:all)
                  @membership ||= Member.new
                end
                def update
                  @user.admin = params[:user][:admin] if params[:user][:admin]
                  @user.login = params[:user][:login] if params[:user][:login]
                  if params[:user][:password].present? && (@user.auth_source_id.nil? || params[:user][:auth_source_id].blank?)
                    @user.password, @user.password_confirmation = params[:user][:password], params[:user][:password_confirmation]
                  end
                  @user.safe_attributes = params[:user]
                  # Was the account actived ? (do it before User#save clears the change)
                  was_activated = (@user.status_change == [User::STATUS_REGISTERED, User::STATUS_ACTIVE])
                  # TODO: Similar to My#account
                  @user.pref.attributes = params[:pref]
                  @user.pref[:no_self_notified] = (params[:no_self_notified] == '1')
                  if @user.save
                    @user.pref.save
                    @user.notified_project_ids = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : [])
                    if was_activated
                      Mailer.deliver_account_activated(@user)
                    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)
-                       redirect_to :back
+                       redirect_to_referer_or edit_user_path(@user)
                      }
                      format.api  { head :ok }
                    end
                  else
                    @auth_sources = AuthSource.find(:all)
                    @membership ||= Member.new
                    # Clear password input
                    @user.password = @user.password_confirmation = nil
                    respond_to do |format|
                      format.html { render :action => :edit }
                      format.api  { render_validation_errors(@user) }
                    end
                  end
-               rescue ::ActionController::RedirectBackError
-                 redirect_to :controller => 'users', :action => 'edit', :id => @user
                end
                def destroy
                  @user.destroy
                  respond_to do |format|
                    format.html { redirect_to(users_url) }
                    format.api  { head :ok }
                  end
                end
                def edit_membership
                  @membership = Member.edit_membership(params[:membership_id], params[:membership], @user)
                  @membership.save
                  respond_to do |format|
                    if @membership.valid?
                      format.html { redirect_to :controller => 'users', :action => 'edit', :id => @user, :tab => 'memberships' }
                      format.js {
                        render(:update) {|page|
                          page.replace_html "tab-content-memberships", :partial => 'users/memberships'
                          page.visual_effect(:highlight, "member-#{@membership.id}")
                        }
                      }
                    else
                      format.js {
                        render(:update) {|page|
                          page.alert(l(:notice_failed_to_save_members, :errors => @membership.errors.full_messages.join(', ')))
                        }
                      }
                    end
                  end
                end
                def destroy_membership
                  @membership = Member.find(params[:membership_id])
                  if @membership.deletable?
                    @membership.destroy
                  end
                  respond_to do |format|
                    format.html { redirect_to :controller => 'users', :action => 'edit', :id => @user, :tab => 'memberships' }
                    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
                    @user = User.current
                  else
                    @user = User.find(params[:id])
                  end
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
              end

app/controllers/watchers_controller.rb +2 -6

              # Redmine - project management software
              # Copyright (C) 2006-2011  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # 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 WatchersController < ApplicationController
                before_filter :find_project
                before_filter :require_login, :check_project_privacy, :only => [:watch, :unwatch]
                before_filter :authorize, :only => [:new, :destroy]
                def watch
                  if @watched.respond_to?(:visible?) && !@watched.visible?(User.current)
                    render_403
                  else
                    set_watcher(User.current, true)
                  end
                end
                def unwatch
                  set_watcher(User.current, false)
                end
                def new
                  respond_to do |format|
                    format.js do
                      render :update do |page|
                        page.replace_html 'ajax-modal', :partial => 'watchers/new', :locals => {:watched => @watched}
                        page << "showModal('ajax-modal', '400px');"
                        page << "$('ajax-modal').addClassName('new-watcher');"
                      end
                    end
                  end
                end
                def create
                  if params[:watcher].is_a?(Hash) && request.post?
                    user_ids = params[:watcher][:user_ids] || [params[:watcher][:user_id]]
                    user_ids.each do |user_id|
                      Watcher.create(:watchable => @watched, :user_id => user_id)
                    end
                  end
                  respond_to do |format|
-                   format.html { redirect_to :back }
+                   format.html { redirect_to_referer_or {render :text => 'Watcher added.', :layout => true}}
                    format.js do
                      render :update do |page|
                        page.replace_html 'ajax-modal', :partial => 'watchers/new', :locals => {:watched => @watched}
                        page.replace_html 'watchers', :partial => 'watchers/watchers', :locals => {:watched => @watched}
                      end
                    end
                  end
-               rescue ::ActionController::RedirectBackError
-                 render :text => 'Watcher added.', :layout => true
                end
                def append
                  if params[:watcher].is_a?(Hash)
                    user_ids = params[:watcher][:user_ids] || [params[:watcher][:user_id]]
                    users = User.active.find_all_by_id(user_ids)
                    respond_to do |format|
                      format.js do
                        render :update do |page|
                          users.each do |user|
                            page.select("#issue_watcher_user_ids_#{user.id}").each do |item|
                              page.remove item
                            end
                          end
                          page.insert_html :bottom, 'watchers_inputs', :text => watchers_checkboxes(nil, users, true)
                        end
                      end
                    end
                  end
                end
                def destroy
                  @watched.set_watcher(User.find(params[:user_id]), false) if request.post?
                  respond_to do |format|
                    format.html { redirect_to :back }
                    format.js do
                      render :update do |page|
                        page.replace_html 'watchers', :partial => 'watchers/watchers', :locals => {:watched => @watched}
                      end
                    end
                  end
                end
                def autocomplete_for_user
                  @users = User.active.like(params[:q]).find(:all, :limit => 100)
                  if @watched
                    @users -= @watched.watcher_users
                  end
                  render :layout => false
                end
              private
                def find_project
                  if params[:object_type] && params[:object_id]
                    klass = Object.const_get(params[:object_type].camelcase)
                    return false unless klass.respond_to?('watched_by')
                    @watched = klass.find(params[:object_id])
                    @project = @watched.project
                  elsif params[:project_id]
                    @project = Project.visible.find(params[:project_id])
                  end
                rescue
                  render_404
                end
                def set_watcher(user, watching)
                  @watched.set_watcher(user, watching)
                  respond_to do |format|
-                   format.html { redirect_to :back }
+                   format.html { redirect_to_referer_or {render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true}}
                    format.js do
                      render(:update) do |page|
                        c = watcher_css(@watched)
                        page.select(".#{c}").each do |item|
                          page.replace_html item, watcher_link(@watched, user)
                        end
                      end
                    end
                  end
-               rescue ::ActionController::RedirectBackError
-                 render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true
                end
              end

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