jro_apps/redmine Commit - r4352:224921460a0a

Adds a pseudo format to api template names and overrides ActionController#default_template so that api templates are chosen automatically....

Jean-Philippe Lang -

r4352:224921460a0a

parent child

Context file:

r4352:224921460a0a

Collapse all files

app/controllers/application_controller.rb +21 -1

              # redMine - project management software
              # Copyright (C) 2006-2007  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 ApplicationController < ActionController::Base
                include Redmine::I18n
                layout 'base'
-               exempt_from_layout 'builder', 'apit'
+               exempt_from_layout 'builder', 'rsb'
                # 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
                before_filter :user_setup, :check_if_login_required, :set_localization
                filter_parameter_logging :password
                protect_from_forgery
                rescue_from ActionController::InvalidAuthenticityToken, :with => :invalid_authenticity_token
                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] && accept_key_auth_actions.include?(params[:action])
                    # RSS key authentication does not start a session
                    User.find_by_rss_key(params[:key])
                  elsif Setting.rest_api_enabled? && ['xml', 'json'].include?(params[:format])
                    if params[:key].present? && accept_key_auth_actions.include?(params[:action])
                      # Use API key
                      User.find_by_api_key(params[: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
                rescue ActiveRecord::RecordNotFound
                  render_404
                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?
                  @projects = @issues.collect(&:project).compact.uniq
                  @project = @projects.first if @projects.size == 1
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                # Check if project is unique before bulk operations
                def check_project_uniqueness
                  unless @project
                    # TODO: let users bulk edit/move/destroy issues from different projects
                    render_error 'Can not bulk edit/move/destroy issues from different projects'
                    return false
                  end
                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.is_public? || User.current.member_of?(@project) || User.current.admin?
                      true
                    else
                      User.current.logged? ? render_403 : require_login
                    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
                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
                # 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.rxml", :layout => false, :content_type => 'application/atom+xml'
                end
                def self.accept_key_auth(*actions)
                  actions = actions.flatten.map(&:to_s)
                  write_inheritable_attribute('accept_key_auth_actions', actions)
                end
                def accept_key_auth_actions
                  self.class.read_inheritable_attribute('accept_key_auth_actions') || []
                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
                # 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
                # 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
                # Converts the errors on an ActiveRecord object into a common JSON format
                def object_errors_to_json(object)
                  object.errors.collect do |attribute, error|
                    { attribute => error }
                  end.to_json
                end
                # Renders API response on validation failure
                def render_validation_errors(object)
                  options = { :status => :unprocessable_entity, :layout => false }
                  options.merge!(case params[:format]
                    when 'xml';  { :xml =>  object.errors }
                    when 'json'; { :json => {'errors' => object.errors} } # ActiveResource client compliance
                    else
                      raise "Unknown format #{params[:format]} in #render_validation_errors"
                    end
                  )
                  render options
                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/issues_controller.rb +3 -3

              # Redmine - project management software
              # Copyright (C) 2006-2008  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 IssuesController < ApplicationController
                menu_item :new_issue, :only => [:new, :create]
                default_search_scope :issues
                before_filter :find_issue, :only => [:show, :edit, :update]
                before_filter :find_issues, :only => [:bulk_edit, :bulk_update, :move, :perform_move, :destroy]
                before_filter :check_project_uniqueness, :only => [:move, :perform_move]
                before_filter :find_project, :only => [:new, :create]
                before_filter :authorize, :except => [:index]
                before_filter :find_optional_project, :only => [:index]
                before_filter :check_for_default_issue_status, :only => [:new, :create]
                before_filter :build_new_issue_from_params, :only => [:new, :create]
                accept_key_auth :index, :show, :create, :update, :destroy
                rescue_from Query::StatementInvalid, :with => :query_statement_invalid
                helper :journals
                helper :projects
                include ProjectsHelper
                helper :custom_fields
                include CustomFieldsHelper
                helper :issue_relations
                include IssueRelationsHelper
                helper :watchers
                include WatchersHelper
                helper :attachments
                include AttachmentsHelper
                helper :queries
                include QueriesHelper
                helper :sort
                include SortHelper
                include IssuesHelper
                helper :timelog
                helper :gantt
                include Redmine::Export::PDF
                verify :method => [:post, :delete],
                       :only => :destroy,
                       :render => { :nothing => true, :status => :method_not_allowed }
                verify :method => :post, :only => :create, :render => {:nothing => true, :status => :method_not_allowed }
                verify :method => :post, :only => :bulk_update, :render => {:nothing => true, :status => :method_not_allowed }
                verify :method => :put, :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
                def index
                  retrieve_query
                  sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
                  sort_update(@query.sortable_columns)
                  if @query.valid?
                    limit = case params[:format]
                    when 'csv', 'pdf'
                      Setting.issues_export_limit.to_i
                    when 'atom'
                      Setting.feeds_limit.to_i
                    else
                      per_page_option
                    end
                    @issue_count = @query.issue_count
                    @issue_pages = Paginator.new self, @issue_count, limit, params['page']
                    @issues = @query.issues(:include => [:assigned_to, :tracker, :priority, :category, :fixed_version],
                                            :order => sort_clause,
                                            :offset => @issue_pages.current.offset,
                                            :limit => limit)
                    @issue_count_by_group = @query.issue_count_by_group
                    respond_to do |format|
                      format.html { render :template => 'issues/index.rhtml', :layout => !request.xhr? }
-                     format.api  { render :template => 'issues/index.apit' }
+                     format.api
                      format.atom { render_feed(@issues, :title => "#{@project || Setting.app_title}: #{l(:label_issue_plural)}") }
                      format.csv  { send_data(issues_to_csv(@issues, @project), :type => 'text/csv; header=present', :filename => 'export.csv') }
                      format.pdf  { send_data(issues_to_pdf(@issues, @project, @query), :type => 'application/pdf', :filename => 'export.pdf') }
                    end
                  else
                    # Send html if the query is not valid
                    render(:template => 'issues/index.rhtml', :layout => !request.xhr?)
                  end
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def show
                  @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
                  @journals.each_with_index {|j,i| j.indice = i+1}
                  @journals.reverse! if User.current.wants_comments_in_reverse_order?
                  @changesets = @issue.changesets.visible.all
                  @changesets.reverse! if User.current.wants_comments_in_reverse_order?
                  @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
                  @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
                  @priorities = IssuePriority.all
                  @time_entry = TimeEntry.new
                  respond_to do |format|
                    format.html { render :template => 'issues/show.rhtml' }
-                   format.api  { render :template => 'issues/show.apit' }
+                   format.api
                    format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' }
                    format.pdf  { send_data(issue_to_pdf(@issue), :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf") }
                  end
                end
                # Add a new issue
                # The new issue will be created from an existing one if copy_from parameter is given
                def new
                  respond_to do |format|
                    format.html { render :action => 'new', :layout => !request.xhr? }
                    format.js { render :partial => 'attributes' }
                  end
                end
                def create
                  call_hook(:controller_issues_new_before_save, { :params => params, :issue => @issue })
                  if @issue.save
                    attachments = Attachment.attach_files(@issue, params[:attachments])
                    render_attachment_warning_if_needed(@issue)
                    flash[:notice] = l(:notice_successful_create)
                    call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue})
                    respond_to do |format|
                      format.html {
                        redirect_to(params[:continue] ?  { :action => 'new', :project_id => @project, :issue => {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?} } :
                                    { :action => 'show', :id => @issue })
                      }
-                     format.api  { render :template => 'issues/show.apit', :status => :created, :location => issue_url(@issue) }
+                     format.api  { render :action => 'show', :status => :created, :location => issue_url(@issue) }
                    end
                    return
                  else
                    respond_to do |format|
                      format.html { render :action => 'new' }
                      format.api  { render_validation_errors(@issue) }
                    end
                  end
                end
                def edit
                  update_issue_from_params
                  @journal = @issue.current_journal
                  respond_to do |format|
                    format.html { }
                    format.xml  { }
                  end
                end
                def update
                  update_issue_from_params
                  if @issue.save_issue_with_child_records(params, @time_entry)
                    render_attachment_warning_if_needed(@issue)
                    flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record?
                    respond_to do |format|
                      format.html { redirect_back_or_default({:action => 'show', :id => @issue}) }
                      format.api  { head :ok }
                    end
                  else
                    render_attachment_warning_if_needed(@issue)
                    flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record?
                    @journal = @issue.current_journal
                    respond_to do |format|
                      format.html { render :action => 'edit' }
                      format.api  { render_validation_errors(@issue) }
                    end
                  end
                end
                # Bulk edit a set of issues
                def bulk_edit
                  @issues.sort!
                  @available_statuses = @projects.map{|p|Workflow.available_statuses(p)}.inject{|memo,w|memo & w}
                  @custom_fields = @projects.map{|p|p.all_issue_custom_fields}.inject{|memo,c|memo & c}
                  @assignables = @projects.map(&:assignable_users).inject{|memo,a| memo & a}
                  @trackers = @projects.map(&:trackers).inject{|memo,t| memo & t}
                end
                def bulk_update
                  @issues.sort!
                  attributes = parse_params_for_bulk_issue_attributes(params)
                  unsaved_issue_ids = []
                  @issues.each do |issue|
                    issue.reload
                    journal = issue.init_journal(User.current, params[:notes])
                    issue.safe_attributes = attributes
                    call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue })
                    unless issue.save
                      # Keep unsaved issue ids to display them in flash error
                      unsaved_issue_ids << issue.id
                    end
                  end
                  set_flash_from_bulk_issue_save(@issues, unsaved_issue_ids)
                  redirect_back_or_default({:controller => 'issues', :action => 'index', :project_id => @project})
                end
                def destroy
                  @hours = TimeEntry.sum(:hours, :conditions => ['issue_id IN (?)', @issues]).to_f
                  if @hours > 0
                    case params[:todo]
                    when 'destroy'
                      # nothing to do
                    when 'nullify'
                      TimeEntry.update_all('issue_id = NULL', ['issue_id IN (?)', @issues])
                    when 'reassign'
                      reassign_to = @project.issues.find_by_id(params[:reassign_to_id])
                      if reassign_to.nil?
                        flash.now[:error] = l(:error_issue_not_found_in_project)
                        return
                      else
                        TimeEntry.update_all("issue_id = #{reassign_to.id}", ['issue_id IN (?)', @issues])
                      end
                    else
                      # display the destroy form if it's a user request
                      return unless api_request?
                    end
                  end
                  @issues.each(&:destroy)
                  respond_to do |format|
                    format.html { redirect_back_or_default(:action => 'index', :project_id => @project) }
                    format.api  { head :ok }
                  end
                end
              private
                def find_issue
                  @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])
                  @project = @issue.project
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def find_project
                  project_id = (params[:issue] && params[:issue][:project_id]) || params[:project_id]
                  @project = Project.find(project_id)
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                # Used by #edit and #update to set some common instance variables
                # from the params
                # TODO: Refactor, not everything in here is needed by #edit
                def update_issue_from_params
                  @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
                  @priorities = IssuePriority.all
                  @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
                  @time_entry = TimeEntry.new
                  @time_entry.attributes = params[:time_entry]
                  @notes = params[:notes] || (params[:issue].present? ? params[:issue][:notes] : nil)
                  @issue.init_journal(User.current, @notes)
                  @issue.safe_attributes = params[:issue]
                end
                # TODO: Refactor, lots of extra code in here
                # TODO: Changing tracker on an existing issue should not trigger this
                def build_new_issue_from_params
                  if params[:id].blank?
                    @issue = Issue.new
                    @issue.copy_from(params[:copy_from]) if params[:copy_from]
                    @issue.project = @project
                  else
                    @issue = @project.issues.visible.find(params[:id])
                  end
                  @issue.project = @project
                  # Tracker must be set before custom field values
                  @issue.tracker ||= @project.trackers.find((params[:issue] && params[:issue][:tracker_id]) || params[:tracker_id] || :first)
                  if @issue.tracker.nil?
                    render_error l(:error_no_tracker_in_project)
                    return false
                  end
                  @issue.start_date ||= Date.today
                  if params[:issue].is_a?(Hash)
                    @issue.safe_attributes = params[:issue]
                    if User.current.allowed_to?(:add_issue_watchers, @project) && @issue.new_record?
                      @issue.watcher_user_ids = params[:issue]['watcher_user_ids']
                    end
                  end
                  @issue.author = User.current
                  @priorities = IssuePriority.all
                  @allowed_statuses = @issue.new_statuses_allowed_to(User.current, true)
                end
                def check_for_default_issue_status
                  if IssueStatus.default.nil?
                    render_error l(:error_no_default_issue_status)
                    return false
                  end
                end
                def parse_params_for_bulk_issue_attributes(params)
                  attributes = (params[:issue] || {}).reject {|k,v| v.blank?}
                  attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'}
                  attributes[:custom_field_values].reject! {|k,v| v.blank?} if attributes[:custom_field_values]
                  attributes
                end
              end

app/controllers/projects_controller.rb +2 -3

              # Redmine - project management software
              # Copyright (C) 2006-2009  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 ProjectsController < ApplicationController
                menu_item :overview
                menu_item :roadmap, :only => :roadmap
                menu_item :settings, :only => :settings
                before_filter :find_project, :except => [ :index, :list, :new, :create, :copy ]
                before_filter :authorize, :except => [ :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy]
                before_filter :authorize_global, :only => [:new, :create]
                before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ]
                accept_key_auth :index, :show, :create, :update, :destroy
                after_filter :only => [:create, :edit, :update, :archive, :unarchive, :destroy] do |controller|
                  if controller.request.post?
                    controller.send :expire_action, :controller => 'welcome', :action => 'robots.txt'
                  end
                end
                # TODO: convert to PUT only
                verify :method => [:post, :put], :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
                helper :sort
                include SortHelper
                helper :custom_fields
                include CustomFieldsHelper
                helper :issues
                helper :queries
                include QueriesHelper
                helper :repositories
                include RepositoriesHelper
                include ProjectsHelper
                # Lists visible projects
                def index
                  respond_to do |format|
                    format.html {
                      @projects = Project.visible.find(:all, :order => 'lft')
                    }
                    format.api  {
                      @projects = Project.visible.find(:all, :order => 'lft')
-                     render :template => 'projects/index.apit'
                    }
                    format.atom {
                      projects = Project.visible.find(:all, :order => 'created_on DESC',
                                                            :limit => Setting.feeds_limit.to_i)
                      render_feed(projects, :title => "#{Setting.app_title}: #{l(:label_project_latest)}")
                    }
                  end
                end
                def new
                  @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                  @trackers = Tracker.all
                  @project = Project.new(params[:project])
                end
                def create
                  @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                  @trackers = Tracker.all
                  @project = Project.new(params[:project])
                  @project.enabled_module_names = params[:enabled_modules] if params[:enabled_modules]
                  if validate_parent_id && @project.save
                    @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
                    # Add current user as a project member if he is not admin
                    unless User.current.admin?
                      r = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first
                      m = Member.new(:user => User.current, :roles => [r])
                      @project.members << m
                    end
                    respond_to do |format|
                      format.html {
                        flash[:notice] = l(:notice_successful_create)
                        redirect_to :controller => 'projects', :action => 'settings', :id => @project
                      }
-                     format.api  { render :template => 'projects/show.apit', :status => :created, :location => url_for(:controller => 'projects', :action => 'show', :id => @project.id) }
+                     format.api  { render :action => 'show', :status => :created, :location => url_for(:controller => 'projects', :action => 'show', :id => @project.id) }
                    end
                  else
                    respond_to do |format|
                      format.html { render :action => 'new' }
                      format.api  { render_validation_errors(@project) }
                    end
                  end
                end
                def copy
                  @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                  @trackers = Tracker.all
                  @root_projects = Project.find(:all,
                                                :conditions => "parent_id IS NULL AND status = #{Project::STATUS_ACTIVE}",
                                                :order => 'name')
                  @source_project = Project.find(params[:id])
                  if request.get?
                    @project = Project.copy_from(@source_project)
                    if @project
                      @project.identifier = Project.next_identifier if Setting.sequential_project_identifiers?
                    else
                      redirect_to :controller => 'admin', :action => 'projects'
                    end
                  else
                    Mailer.with_deliveries(params[:notifications] == '1') do
                      @project = Project.new(params[:project])
                      @project.enabled_module_names = params[:enabled_modules]
                      if validate_parent_id && @project.copy(@source_project, :only => params[:only])
                        @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
                        flash[:notice] = l(:notice_successful_create)
                        redirect_to :controller => 'projects', :action => 'settings'
                      elsif !@project.new_record?
                        # Project was created
                        # But some objects were not copied due to validation failures
                        # (eg. issues from disabled trackers)
                        # TODO: inform about that
                        redirect_to :controller => 'projects', :action => 'settings'
                      end
                    end
                  end
                rescue ActiveRecord::RecordNotFound
                  redirect_to :controller => 'admin', :action => 'projects'
                end
                # Show @project
                def show
                  if params[:jump]
                    # try to redirect to the requested menu item
                    redirect_to_project_menu_item(@project, params[:jump]) && return
                  end
                  @users_by_role = @project.users_by_role
                  @subprojects = @project.children.visible
                  @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
                  @trackers = @project.rolled_up_trackers
                  cond = @project.project_condition(Setting.display_subprojects_issues?)
                  @open_issues_by_tracker = Issue.visible.count(:group => :tracker,
                                                          :include => [:project, :status, :tracker],
                                                          :conditions => ["(#{cond}) AND #{IssueStatus.table_name}.is_closed=?", false])
                  @total_issues_by_tracker = Issue.visible.count(:group => :tracker,
                                                          :include => [:project, :status, :tracker],
                                                          :conditions => cond)
                  TimeEntry.visible_by(User.current) do
                    @total_hours = TimeEntry.sum(:hours,
                                                 :include => :project,
                                                 :conditions => cond).to_f
                  end
                  @key = User.current.rss_key
                  respond_to do |format|
                    format.html
-                   format.api { render :template => 'projects/show.apit'}
+                   format.api
                  end
                end
                def settings
                  @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                  @issue_category ||= IssueCategory.new
                  @member ||= @project.members.new
                  @trackers = Tracker.all
                  @repository ||= @project.repository
                  @wiki ||= @project.wiki
                end
                def edit
                end
                def update
                  @project.attributes = params[:project]
                  if validate_parent_id && @project.save
                    @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
                    respond_to do |format|
                      format.html {
                        flash[:notice] = l(:notice_successful_update)
                        redirect_to :action => 'settings', :id => @project
                      }
                      format.api  { head :ok }
                    end
                  else
                    respond_to do |format|
                      format.html {
                        settings
                        render :action => 'settings'
                      }
                      format.api  { render_validation_errors(@project) }
                    end
                  end
                end
                def modules
                  @project.enabled_module_names = params[:enabled_modules]
                  flash[:notice] = l(:notice_successful_update)
                  redirect_to :action => 'settings', :id => @project, :tab => 'modules'
                end
                def archive
                  if request.post?
                    unless @project.archive
                      flash[:error] = l(:error_can_not_archive_project)
                    end
                  end
                  redirect_to(url_for(:controller => 'admin', :action => 'projects', :status => params[:status]))
                end
                def unarchive
                  @project.unarchive if request.post? && !@project.active?
                  redirect_to(url_for(:controller => 'admin', :action => 'projects', :status => params[:status]))
                end
                # Delete @project
                def destroy
                  @project_to_destroy = @project
                  if request.get?
                    # display confirmation view
                  else
                    if api_request? || params[:confirm]
                      @project_to_destroy.destroy
                      respond_to do |format|
                        format.html { redirect_to :controller => 'admin', :action => 'projects' }
                        format.api  { head :ok }
                      end
                    end
                  end
                  # hide project in layout
                  @project = nil
                end
              private
                def find_optional_project
                  return true unless params[:id]
                  @project = Project.find(params[:id])
                  authorize
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                # Validates parent_id param according to user's permissions
                # TODO: move it to Project model in a validation that depends on User.current
                def validate_parent_id
                  return true if User.current.admin?
                  parent_id = params[:project] && params[:project][:parent_id]
                  if parent_id || @project.new_record?
                    parent = parent_id.blank? ? nil : Project.find_by_id(parent_id.to_i)
                    unless @project.allowed_parents.include?(parent)
                      @project.errors.add :parent_id, :invalid
                      return false
                    end
                  end
                  true
                end
              end

app/controllers/timelog_controller.rb +2 -4

              # Redmine - project management software
              # Copyright (C) 2006-2010  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 TimelogController < ApplicationController
                menu_item :issues
                before_filter :find_project, :only => [:new, :create]
                before_filter :find_time_entry, :only => [:show, :edit, :update, :destroy]
                before_filter :authorize, :except => [:index]
                before_filter :find_optional_project, :only => [:index]
                accept_key_auth :index, :show, :create, :update, :destroy
                helper :sort
                include SortHelper
                helper :issues
                include TimelogHelper
                helper :custom_fields
                include CustomFieldsHelper
                def index
                  sort_init 'spent_on', 'desc'
                  sort_update 'spent_on' => 'spent_on',
                              'user' => 'user_id',
                              'activity' => 'activity_id',
                              'project' => "#{Project.table_name}.name",
                              'issue' => 'issue_id',
                              'hours' => 'hours'
                  cond = ARCondition.new
                  if @project.nil?
                    cond << Project.allowed_to_condition(User.current, :view_time_entries)
                  elsif @issue.nil?
                    cond << @project.project_condition(Setting.display_subprojects_issues?)
                  else
                    cond << "#{Issue.table_name}.root_id = #{@issue.root_id} AND #{Issue.table_name}.lft >= #{@issue.lft} AND #{Issue.table_name}.rgt <= #{@issue.rgt}"
                  end
                  retrieve_date_range
                  cond << ['spent_on BETWEEN ? AND ?', @from, @to]
                  TimeEntry.visible_by(User.current) do
                    respond_to do |format|
                      format.html {
                        # Paginate results
                        @entry_count = TimeEntry.count(:include => [:project, :issue], :conditions => cond.conditions)
                        @entry_pages = Paginator.new self, @entry_count, per_page_option, params['page']
                        @entries = TimeEntry.find(:all,
                                                  :include => [:project, :activity, :user, {:issue => :tracker}],
                                                  :conditions => cond.conditions,
                                                  :order => sort_clause,
                                                  :limit  =>  @entry_pages.items_per_page,
                                                  :offset =>  @entry_pages.current.offset)
                        @total_hours = TimeEntry.sum(:hours, :include => [:project, :issue], :conditions => cond.conditions).to_f
                        render :layout => !request.xhr?
                      }
                      format.api  {
                        @entry_count = TimeEntry.count(:include => [:project, :issue], :conditions => cond.conditions)
                        @entry_pages = Paginator.new self, @entry_count, per_page_option, params['page']
                        @entries = TimeEntry.find(:all,
                                                  :include => [:project, :activity, :user, {:issue => :tracker}],
                                                  :conditions => cond.conditions,
                                                  :order => sort_clause,
                                                  :limit  =>  @entry_pages.items_per_page,
                                                  :offset =>  @entry_pages.current.offset)
-                       render :template => 'timelog/index.apit'
                      }
                      format.atom {
                        entries = TimeEntry.find(:all,
                                                 :include => [:project, :activity, :user, {:issue => :tracker}],
                                                 :conditions => cond.conditions,
                                                 :order => "#{TimeEntry.table_name}.created_on DESC",
                                                 :limit => Setting.feeds_limit.to_i)
                        render_feed(entries, :title => l(:label_spent_time))
                      }
                      format.csv {
                        # Export all entries
                        @entries = TimeEntry.find(:all,
                                                  :include => [:project, :activity, :user, {:issue => [:tracker, :assigned_to, :priority]}],
                                                  :conditions => cond.conditions,
                                                  :order => sort_clause)
                        send_data(entries_to_csv(@entries), :type => 'text/csv; header=present', :filename => 'timelog.csv')
                      }
                    end
                  end
                end
                def show
                  respond_to do |format|
                    # TODO: Implement html response
                    format.html { render :nothing => true, :status => 406 }
-                   format.api  { render :template => 'timelog/show.apit' }
+                   format.api
                  end
                end
                def new
                  @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => User.current.today)
                  @time_entry.attributes = params[:time_entry]
                  call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
                  render :action => 'edit'
                end
                verify :method => :post, :only => :create, :render => {:nothing => true, :status => :method_not_allowed }
                def create
                  @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => User.current.today)
                  @time_entry.attributes = params[:time_entry]
                  call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
                  if @time_entry.save
                    respond_to do |format|
                      format.html {
                        flash[:notice] = l(:notice_successful_update)
                        redirect_back_or_default :action => 'index', :project_id => @time_entry.project
                      }
-                     format.api  { render :template => 'timelog/show.apit', :status => :created, :location => time_entry_url(@time_entry) }
+                     format.api  { render :action => 'show', :status => :created, :location => time_entry_url(@time_entry) }
                    end
                  else
                    respond_to do |format|
                      format.html { render :action => 'edit' }
                      format.api  { render_validation_errors(@time_entry) }
                    end
                  end
                end
                def edit
                  @time_entry.attributes = params[:time_entry]
                  call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
                end
                verify :method => :put, :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
                def update
                  @time_entry.attributes = params[:time_entry]
                  call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
                  if @time_entry.save
                    respond_to do |format|
                      format.html {
                        flash[:notice] = l(:notice_successful_update)
                        redirect_back_or_default :action => 'index', :project_id => @time_entry.project
                      }
                      format.api  { head :ok }
                    end
                  else
                    respond_to do |format|
                      format.html { render :action => 'edit' }
                      format.api  { render_validation_errors(@time_entry) }
                    end
                  end
                end
                verify :method => :delete, :only => :destroy, :render => {:nothing => true, :status => :method_not_allowed }
                def destroy
                  if @time_entry.destroy && @time_entry.destroyed?
                    respond_to do |format|
                      format.html {
                        flash[:notice] = l(:notice_successful_delete)
                        redirect_to :back
                      }
                      format.api  { head :ok }
                    end
                  else
                    respond_to do |format|
                      format.html {
                        flash[:error] = l(:notice_unable_delete_time_entry)
                        redirect_to :back
                      }
                      format.api  { render_validation_errors(@time_entry) }
                    end
                  end
                rescue ::ActionController::RedirectBackError
                  redirect_to :action => 'index', :project_id => @time_entry.project
                end
              private
                def find_time_entry
                  @time_entry = TimeEntry.find(params[:id])
                  unless @time_entry.editable_by?(User.current)
                    render_403
                    return false
                  end
                  @project = @time_entry.project
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def find_project
                  if issue_id = (params[:issue_id] || params[:time_entry] && params[:time_entry][:issue_id])
                    @issue = Issue.find(issue_id)
                    @project = @issue.project
                  elsif project_id = (params[:project_id] || params[:time_entry] && params[:time_entry][:project_id])
                    @project = Project.find(project_id)
                  else
                    render_404
                    return false
                  end
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def find_optional_project
                  if !params[:issue_id].blank?
                    @issue = Issue.find(params[:issue_id])
                    @project = @issue.project
                  elsif !params[:project_id].blank?
                    @project = Project.find(params[:project_id])
                  end
                  deny_access unless User.current.allowed_to?(:view_time_entries, @project, :global => true)
                end
                # Retrieves the date range based on predefined ranges or specific from/to param dates
                def retrieve_date_range
                  @free_period = false
                  @from, @to = nil, nil
                  if params[:period_type] == '1' || (params[:period_type].nil? && !params[:period].nil?)
                    case params[:period].to_s
                    when 'today'
                      @from = @to = Date.today
                    when 'yesterday'
                      @from = @to = Date.today - 1
                    when 'current_week'
                      @from = Date.today - (Date.today.cwday - 1)%7
                      @to = @from + 6
                    when 'last_week'
                      @from = Date.today - 7 - (Date.today.cwday - 1)%7
                      @to = @from + 6
                    when '7_days'
                      @from = Date.today - 7
                      @to = Date.today
                    when 'current_month'
                      @from = Date.civil(Date.today.year, Date.today.month, 1)
                      @to = (@from >> 1) - 1
                    when 'last_month'
                      @from = Date.civil(Date.today.year, Date.today.month, 1) << 1
                      @to = (@from >> 1) - 1
                    when '30_days'
                      @from = Date.today - 30
                      @to = Date.today
                    when 'current_year'
                      @from = Date.civil(Date.today.year, 1, 1)
                      @to = Date.civil(Date.today.year, 12, 31)
                    end
                  elsif params[:period_type] == '2' || (params[:period_type].nil? && (!params[:from].nil? || !params[:to].nil?))
                    begin; @from = params[:from].to_s.to_date unless params[:from].blank?; rescue; end
                    begin; @to = params[:to].to_s.to_date unless params[:to].blank?; rescue; end
                    @free_period = true
                  else
                    # default
                  end
                  @from, @to = @to, @from if @from && @to && @from > @to
                  @from ||= (TimeEntry.earilest_date_for_project(@project) || Date.today)
                  @to   ||= (TimeEntry.latest_date_for_project(@project) || Date.today)
                end
              end

app/controllers/users_controller.rb +3 -3

              # Redmine - project management software
              # Copyright (C) 2006-2010  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
                accept_key_auth :index, :show, :create, :update
                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)
                  @status = params[:status] ? params[:status].to_i : 1
                  c = ARCondition.new(@status == 0 ? "status <> 0" : ["status = ?", @status])
                  unless params[:name].blank?
                    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 = User.count(:conditions => c.conditions)
                  @user_pages = Paginator.new self, @user_count,
              								per_page_option,
              								params['page']
                  @users =  User.find :all,:order => sort_clause,
                                      :conditions => c.conditions,
              						:limit  =>  @user_pages.items_per_page,
              						:offset =>  @user_pages.current.offset
              		respond_to do |format|
              		  format.html { render :layout => !request.xhr? }
-                   format.api  { render :template => 'users/index.apit' }
+                   format.api
              		end
                end
                def show
                  @user = User.find(params[:id])
                  # show projects based on current user visibility
                  @memberships = @user.memberships.all(:conditions => Project.visible_by(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  { render :template => 'users/show.apit' }
+                   format.api
                  end
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def new
                  @notification_options = User::MAIL_NOTIFICATION_OPTIONS
                  @notification_option = Setting.default_notification_option
                  @user = User.new(:language => Setting.default_language)
                  @auth_sources = AuthSource.find(:all)
                end
                verify :method => :post, :only => :create, :render => {:nothing => true, :status => :method_not_allowed }
                def create
                  @notification_options = User::MAIL_NOTIFICATION_OPTIONS
                  @notification_option = Setting.default_notification_option
                  @user = User.new(params[:user])
                  @user.admin = params[:user][:admin] || false
                  @user.login = params[:user][:login]
                  @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless @user.auth_source_id
                  # TODO: Similar to My#account
                  @user.mail_notification = params[:notification_option] || 'only_my_events'
                  @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 = (params[:notification_option] == 'selected' ? params[:notified_project_ids] : [])
                    Mailer.deliver_account_information(@user, params[: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 :template => 'users/show.apit', :status => :created, :location => user_url(@user) }
+                     format.api  { render :action => 'show', :status => :created, :location => user_url(@user) }
                    end
                  else
                    @auth_sources = AuthSource.find(:all)
                    @notification_option = @user.mail_notification
                    respond_to do |format|
                      format.html { render :action => 'new' }
                      format.api  { render_validation_errors(@user) }
                    end
                  end
                end
                def edit
                  @user = User.find(params[:id])
                  @notification_options = @user.valid_notification_options
                  @notification_option = @user.mail_notification
                  @auth_sources = AuthSource.find(:all)
                  @membership ||= Member.new
                end
                verify :method => :put, :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
                def update
                  @user = User.find(params[:id])
                  @notification_options = @user.valid_notification_options
                  @notification_option = @user.mail_notification
                  @user.admin = params[:user][:admin] if params[:user][:admin]
                  @user.login = params[:user][:login] if params[:user][:login]
                  if params[:password].present? && (@user.auth_source_id.nil? || params[:user][:auth_source_id].blank?)
                    @user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
                  end
                  @user.group_ids = params[:user][:group_ids] if params[:user][:group_ids]
                  @user.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.mail_notification = params[:notification_option] || 'only_my_events'
                  @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 = (params[:notification_option] == 'selected' ? params[:notified_project_ids] : [])
                    if was_activated
                      Mailer.deliver_account_activated(@user)
                    elsif @user.active? && params[:send_information] && !params[:password].blank? && @user.auth_source_id.nil?
                      Mailer.deliver_account_information(@user, params[:password])
                    end
                    respond_to do |format|
                      format.html {
                        flash[:notice] = l(:notice_successful_update)
                        redirect_to :back
                      }
                      format.api  { head :ok }
                    end
                  else
                    @auth_sources = AuthSource.find(:all)
                    @membership ||= Member.new
                    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 edit_membership
                  @user = User.find(params[:id])
                  @membership = Member.edit_membership(params[:membership_id], params[:membership], @user)
                  @membership.save if request.post?
                  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
                  @user = User.find(params[:id])
                  @membership = Member.find(params[:membership_id])
                  if request.post? && @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
              end

app/views/issues/index.api.rsb ~~app/views/issues/index.apit~~ renamed 0 0

NO CONTENT: file renamed from app/views/issues/index.apit to app/views/issues/index.api.rsb

app/views/issues/show.api.rsb ~~app/views/issues/show.apit~~ renamed 0 0

NO CONTENT: file renamed from app/views/issues/show.apit to app/views/issues/show.api.rsb

app/views/projects/index.api.rsb ~~app/views/projects/index.apit~~ renamed 0 0

NO CONTENT: file renamed from app/views/projects/index.apit to app/views/projects/index.api.rsb

app/views/projects/show.api.rsb ~~app/views/projects/show.apit~~ renamed 0 0

NO CONTENT: file renamed from app/views/projects/show.apit to app/views/projects/show.api.rsb

app/views/timelog/index.api.rsb ~~app/views/timelog/index.apit~~ renamed 0 0

NO CONTENT: file renamed from app/views/timelog/index.apit to app/views/timelog/index.api.rsb

app/views/timelog/show.api.rsb ~~app/views/timelog/show.apit~~ renamed 0 0

NO CONTENT: file renamed from app/views/timelog/show.apit to app/views/timelog/show.api.rsb

app/views/users/index.api.rsb ~~app/views/users/index.apit~~ renamed 0 0

NO CONTENT: file renamed from app/views/users/index.apit to app/views/users/index.api.rsb

app/views/users/show.api.rsb ~~app/views/users/show.apit~~ renamed 0 0

NO CONTENT: file renamed from app/views/users/show.apit to app/views/users/show.api.rsb

lib/redmine.rb +1 -1

              require 'redmine/access_control'
              require 'redmine/menu_manager'
              require 'redmine/activity'
              require 'redmine/search'
              require 'redmine/custom_field_format'
              require 'redmine/mime_type'
              require 'redmine/core_ext'
              require 'redmine/themes'
              require 'redmine/hook'
              require 'redmine/plugin'
              require 'redmine/notifiable'
              require 'redmine/wiki_formatting'
              require 'redmine/scm/base'
              begin
                require_library_or_gem 'RMagick' unless Object.const_defined?(:Magick)
              rescue LoadError
                # RMagick is not available
              end
              if RUBY_VERSION < '1.9'
                require 'faster_csv'
              else
                require 'csv'
                FCSV = CSV
              end
              Redmine::Scm::Base.add "Subversion"
              Redmine::Scm::Base.add "Darcs"
              Redmine::Scm::Base.add "Mercurial"
              Redmine::Scm::Base.add "Cvs"
              Redmine::Scm::Base.add "Bazaar"
              Redmine::Scm::Base.add "Git"
              Redmine::Scm::Base.add "Filesystem"
              Redmine::CustomFieldFormat.map do |fields|
                fields.register Redmine::CustomFieldFormat.new('string', :label => :label_string, :order => 1)
                fields.register Redmine::CustomFieldFormat.new('text', :label => :label_text, :order => 2)
                fields.register Redmine::CustomFieldFormat.new('int', :label => :label_integer, :order => 3)
                fields.register Redmine::CustomFieldFormat.new('float', :label => :label_float, :order => 4)
                fields.register Redmine::CustomFieldFormat.new('list', :label => :label_list, :order => 5)
                fields.register Redmine::CustomFieldFormat.new('date', :label => :label_date, :order => 6)
                fields.register Redmine::CustomFieldFormat.new('bool', :label => :label_boolean, :order => 7)
              end
              # Permissions
              Redmine::AccessControl.map do |map|
                map.permission :view_project, {:projects => [:show], :activities => [:index]}, :public => true
                map.permission :search_project, {:search => :index}, :public => true
                map.permission :add_project, {:projects => [:new, :create]}, :require => :loggedin
                map.permission :edit_project, {:projects => [:settings, :edit, :update]}, :require => :member
                map.permission :select_project_modules, {:projects => :modules}, :require => :member
                map.permission :manage_members, {:projects => :settings, :members => [:new, :edit, :destroy, :autocomplete_for_member]}, :require => :member
                map.permission :manage_versions, {:projects => :settings, :versions => [:new, :create, :edit, :update, :close_completed, :destroy]}, :require => :member
                map.permission :add_subprojects, {:projects => [:new, :create]}, :require => :member
                map.project_module :issue_tracking do |map|
                  # Issue categories
                  map.permission :manage_categories, {:projects => :settings, :issue_categories => [:new, :edit, :destroy]}, :require => :member
                  # Issues
                  map.permission :view_issues, {:issues => [:index, :show],
                                                :auto_complete => [:issues],
                                                :context_menus => [:issues],
                                                :versions => [:index, :show, :status_by],
                                                :journals => :index,
                                                :queries => :index,
                                                :reports => [:issue_report, :issue_report_details]}
                  map.permission :add_issues, {:issues => [:new, :create, :update_form]}
                  map.permission :edit_issues, {:issues => [:edit, :update, :bulk_edit, :bulk_update, :update_form], :journals => [:new]}
                  map.permission :manage_issue_relations, {:issue_relations => [:new, :destroy]}
                  map.permission :manage_subtasks, {}
                  map.permission :add_issue_notes, {:issues => [:edit, :update], :journals => [:new]}
                  map.permission :edit_issue_notes, {:journals => :edit}, :require => :loggedin
                  map.permission :edit_own_issue_notes, {:journals => :edit}, :require => :loggedin
                  map.permission :move_issues, {:issue_moves => [:new, :create]}, :require => :loggedin
                  map.permission :delete_issues, {:issues => :destroy}, :require => :member
                  # Queries
                  map.permission :manage_public_queries, {:queries => [:new, :edit, :destroy]}, :require => :member
                  map.permission :save_queries, {:queries => [:new, :edit, :destroy]}, :require => :loggedin
                  # Watchers
                  map.permission :view_issue_watchers, {}
                  map.permission :add_issue_watchers, {:watchers => :new}
                  map.permission :delete_issue_watchers, {:watchers => :destroy}
                end
                map.project_module :time_tracking do |map|
                  map.permission :log_time, {:timelog => [:new, :create, :edit, :update]}, :require => :loggedin
                  map.permission :view_time_entries, :timelog => [:index, :show], :time_entry_reports => [:report]
                  map.permission :edit_time_entries, {:timelog => [:new, :create, :edit, :update, :destroy]}, :require => :member
                  map.permission :edit_own_time_entries, {:timelog => [:new, :create, :edit, :update, :destroy]}, :require => :loggedin
                  map.permission :manage_project_activities, {:project_enumerations => [:update, :destroy]}, :require => :member
                end
                map.project_module :news do |map|
                  map.permission :manage_news, {:news => [:new, :create, :edit, :update, :destroy], :comments => [:destroy]}, :require => :member
                  map.permission :view_news, {:news => [:index, :show]}, :public => true
                  map.permission :comment_news, {:comments => :create}
                end
                map.project_module :documents do |map|
                  map.permission :manage_documents, {:documents => [:new, :edit, :destroy, :add_attachment]}, :require => :loggedin
                  map.permission :view_documents, :documents => [:index, :show, :download]
                end
                map.project_module :files do |map|
                  map.permission :manage_files, {:files => [:new, :create]}, :require => :loggedin
                  map.permission :view_files, :files => :index, :versions => :download
                end
                map.project_module :wiki do |map|
                  map.permission :manage_wiki, {:wikis => [:edit, :destroy]}, :require => :member
                  map.permission :rename_wiki_pages, {:wiki => :rename}, :require => :member
                  map.permission :delete_wiki_pages, {:wiki => :destroy}, :require => :member
                  map.permission :view_wiki_pages, :wiki => [:index, :show, :special, :date_index]
                  map.permission :export_wiki_pages, :wiki => [:export]
                  map.permission :view_wiki_edits, :wiki => [:history, :diff, :annotate]
                  map.permission :edit_wiki_pages, :wiki => [:edit, :update, :preview, :add_attachment]
                  map.permission :delete_wiki_pages_attachments, {}
                  map.permission :protect_wiki_pages, {:wiki => :protect}, :require => :member
                end
                map.project_module :repository do |map|
                  map.permission :manage_repository, {:repositories => [:edit, :committers, :destroy]}, :require => :member
                  map.permission :browse_repository, :repositories => [:show, :browse, :entry, :annotate, :changes, :diff, :stats, :graph]
                  map.permission :view_changesets, :repositories => [:show, :revisions, :revision]
                  map.permission :commit_access, {}
                end
                map.project_module :boards do |map|
                  map.permission :manage_boards, {:boards => [:new, :edit, :destroy]}, :require => :member
                  map.permission :view_messages, {:boards => [:index, :show], :messages => [:show]}, :public => true
                  map.permission :add_messages, {:messages => [:new, :reply, :quote]}
                  map.permission :edit_messages, {:messages => :edit}, :require => :member
                  map.permission :edit_own_messages, {:messages => :edit}, :require => :loggedin
                  map.permission :delete_messages, {:messages => :destroy}, :require => :member
                  map.permission :delete_own_messages, {:messages => :destroy}, :require => :loggedin
                end
                map.project_module :calendar do |map|
                  map.permission :view_calendar, :calendars => [:show, :update]
                end
                map.project_module :gantt do |map|
                  map.permission :view_gantt, :gantts => [:show, :update]
                end
              end
              Redmine::MenuManager.map :top_menu do |menu|
                menu.push :home, :home_path
                menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? }
                menu.push :projects, { :controller => 'projects', :action => 'index' }, :caption => :label_project_plural
                menu.push :administration, { :controller => 'admin', :action => 'index' }, :if => Proc.new { User.current.admin? }, :last => true
                menu.push :help, Redmine::Info.help_url, :last => true
              end
              Redmine::MenuManager.map :account_menu do |menu|
                menu.push :login, :signin_path, :if => Proc.new { !User.current.logged? }
                menu.push :register, { :controller => 'account', :action => 'register' }, :if => Proc.new { !User.current.logged? && Setting.self_registration? }
                menu.push :my_account, { :controller => 'my', :action => 'account' }, :if => Proc.new { User.current.logged? }
                menu.push :logout, :signout_path, :if => Proc.new { User.current.logged? }
              end
              Redmine::MenuManager.map :application_menu do |menu|
                # Empty
              end
              Redmine::MenuManager.map :admin_menu do |menu|
                menu.push :projects, {:controller => 'admin', :action => 'projects'}, :caption => :label_project_plural
                menu.push :users, {:controller => 'users'}, :caption => :label_user_plural
                menu.push :groups, {:controller => 'groups'}, :caption => :label_group_plural
                menu.push :roles, {:controller => 'roles'}, :caption => :label_role_and_permissions
                menu.push :trackers, {:controller => 'trackers'}, :caption => :label_tracker_plural
                menu.push :issue_statuses, {:controller => 'issue_statuses'}, :caption => :label_issue_status_plural,
                          :html => {:class => 'issue_statuses'}
                menu.push :workflows, {:controller => 'workflows', :action => 'edit'}, :caption => :label_workflow
                menu.push :custom_fields, {:controller => 'custom_fields'},  :caption => :label_custom_field_plural,
                          :html => {:class => 'custom_fields'}
                menu.push :enumerations, {:controller => 'enumerations'}
                menu.push :settings, {:controller => 'settings'}
                menu.push :ldap_authentication, {:controller => 'ldap_auth_sources', :action => 'index'},
                          :html => {:class => 'server_authentication'}
                menu.push :plugins, {:controller => 'admin', :action => 'plugins'}, :last => true
                menu.push :info, {:controller => 'admin', :action => 'info'}, :caption => :label_information_plural, :last => true
              end
              Redmine::MenuManager.map :project_menu do |menu|
                menu.push :overview, { :controller => 'projects', :action => 'show' }
                menu.push :activity, { :controller => 'activities', :action => 'index' }
                menu.push :roadmap, { :controller => 'versions', :action => 'index' }, :param => :project_id,
                            :if => Proc.new { |p| p.shared_versions.any? }
                menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural
                menu.push :new_issue, { :controller => 'issues', :action => 'new' }, :param => :project_id, :caption => :label_issue_new,
                            :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }
                menu.push :gantt, { :controller => 'gantts', :action => 'show' }, :param => :project_id, :caption => :label_gantt
                menu.push :calendar, { :controller => 'calendars', :action => 'show' }, :param => :project_id, :caption => :label_calendar
                menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural
                menu.push :documents, { :controller => 'documents', :action => 'index' }, :param => :project_id, :caption => :label_document_plural
                menu.push :wiki, { :controller => 'wiki', :action => 'show', :id => nil }, :param => :project_id,
                            :if => Proc.new { |p| p.wiki && !p.wiki.new_record? }
                menu.push :boards, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id,
                            :if => Proc.new { |p| p.boards.any? }, :caption => :label_board_plural
                menu.push :files, { :controller => 'files', :action => 'index' }, :caption => :label_file_plural, :param => :project_id
                menu.push :repository, { :controller => 'repositories', :action => 'show' },
                            :if => Proc.new { |p| p.repository && !p.repository.new_record? }
                menu.push :settings, { :controller => 'projects', :action => 'settings' }, :last => true
              end
              Redmine::Activity.map do |activity|
                activity.register :issues, :class_name => %w(Issue Journal)
                activity.register :changesets
                activity.register :news
                activity.register :documents, :class_name => %w(Document Attachment)
                activity.register :files, :class_name => 'Attachment'
                activity.register :wiki_edits, :class_name => 'WikiContent::Version', :default => false
                activity.register :messages, :default => false
                activity.register :time_entries, :default => false
              end
              Redmine::Search.map do |search|
                search.register :issues
                search.register :news
                search.register :documents
                search.register :changesets
                search.register :wiki_pages
                search.register :messages
                search.register :projects
              end
              Redmine::WikiFormatting.map do |format|
                format.register :textile, Redmine::WikiFormatting::Textile::Formatter, Redmine::WikiFormatting::Textile::Helper
              end
-             ActionView::Template.register_template_handler :apit, Redmine::Views::ApiTemplateHandler
+             ActionView::Template.register_template_handler :rsb, Redmine::Views::ApiTemplateHandler

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