jro_apps/redmine Commit - r15695:4ee4fad19ae4

Menu items mapping....

Jean-Philippe Lang -

r15695:4ee4fad19ae4

parent child

Context file:

r15695:4ee4fad19ae4

Collapse all files

app/controllers/imports_controller.rb +1 0

             # Redmine - project management software
             # Copyright (C) 2006-2016  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 'csv'
             class ImportsController < ApplicationController
+              menu_item :issues
               before_action :find_import, :only => [:show, :settings, :mapping, :run]
               before_action :authorize_global
               helper :issues
               helper :queries
               def new
               end
               def create
                 @import = IssueImport.new
                 @import.user = User.current
                 @import.file = params[:file]
                 @import.set_default_settings
                 if @import.save
                   redirect_to import_settings_path(@import)
                 else
                   render :action => 'new'
                 end
               end
               def show
               end
               def settings
                 if request.post? && @import.parse_file
                   redirect_to import_mapping_path(@import)
                 end
               rescue CSV::MalformedCSVError => e
                 flash.now[:error] = l(:error_invalid_csv_file_or_settings)
               rescue ArgumentError, Encoding::InvalidByteSequenceError => e
                 flash.now[:error] = l(:error_invalid_file_encoding, :encoding => ERB::Util.h(@import.settings['encoding']))
               rescue SystemCallError => e
                 flash.now[:error] = l(:error_can_not_read_import_file)
               end
               def mapping
                 @custom_fields = @import.mappable_custom_fields
                 if request.post?
                   respond_to do |format|
                     format.html {
                       if params[:previous]
                         redirect_to import_settings_path(@import)
                       else
                         redirect_to import_run_path(@import)
                       end
                     }
                     format.js # updates mapping form on project or tracker change
                   end
                 end
               end
               def run
                 if request.post?
                   @current = @import.run(
                     :max_items => max_items_per_request,
                     :max_time => 10.seconds
                   )
                   respond_to do |format|
                     format.html {
                       if @import.finished?
                         redirect_to import_path(@import)
                       else
                         redirect_to import_run_path(@import)
                       end
                     }
                     format.js
                   end
                 end
               end
               private
               def find_import
                 @import = Import.where(:user_id => User.current.id, :filename => params[:id]).first
                 if @import.nil?
                   render_404
                   return
                 elsif @import.finished? && action_name != 'show'
                   redirect_to import_path(@import)
                   return
                 end
                 update_from_params if request.post?
               end
               def update_from_params
                 if params[:import_settings].is_a?(Hash)
                   @import.settings ||= {}
                   @import.settings.merge!(params[:import_settings])
                   @import.save!
                 end
               end
               def max_items_per_request
               end
             end

app/controllers/projects_controller.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2016  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 :settings, :only => :settings
-              menu_item :projects, :only => [:index, :new,  :create]
+              menu_item :projects, :only => [:index, :new, :copy, :create]
               before_action :find_project, :except => [ :index, :list, :new, :create, :copy ]
               before_action :authorize, :except => [ :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy]
               before_action :authorize_global, :only => [:new, :create]
               before_action :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ]
               accept_rss_auth :index
               accept_api_auth :index, :show, :create, :update, :destroy
               require_sudo_mode :destroy
               helper :custom_fields
               helper :issues
               helper :queries
               helper :repositories
               helper :members
               # Lists visible projects
               def index
                 scope = Project.visible.sorted
                 respond_to do |format|
                   format.html {
                     unless params[:closed]
                       scope = scope.active
                     end
                     @projects = scope.to_a
                   }
                   format.js {
                     if params[:q].present?
                       @projects = Project.visible.like(params[:q]).to_a
                     else
                       @projects = User.current.projects.to_a
                     end
                   }
                   format.api  {
                     @offset, @limit = api_offset_and_limit
                     @project_count = scope.count
                     @projects = scope.offset(@offset).limit(@limit).to_a
                   }
                   format.atom {
                     projects = scope.reorder(:created_on => :desc).limit(Setting.feeds_limit.to_i).to_a
                     render_feed(projects, :title => "#{Setting.app_title}: #{l(:label_project_latest)}")
                   }
                 end
               end
               def new
                 @issue_custom_fields = IssueCustomField.sorted.to_a
                 @trackers = Tracker.sorted.to_a
                 @project = Project.new
                 @project.safe_attributes = params[:project]
               end
               def create
                 @issue_custom_fields = IssueCustomField.sorted.to_a
                 @trackers = Tracker.sorted.to_a
                 @project = Project.new
                 @project.safe_attributes = params[:project]
                 if @project.save
                   unless User.current.admin?
                     @project.add_default_member(User.current)
                   end
                   respond_to do |format|
                     format.html {
                       flash[:notice] = l(:notice_successful_create)
                       if params[:continue]
                         attrs = {:parent_id => @project.parent_id}.reject {|k,v| v.nil?}
                         redirect_to new_project_path(attrs)
                       else
                         redirect_to settings_project_path(@project)
                       end
                     }
                     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.sorted.to_a
                 @trackers = Tracker.sorted.to_a
                 @source_project = Project.find(params[:id])
                 if request.get?
                   @project = Project.copy_from(@source_project)
                   @project.identifier = Project.next_identifier if Setting.sequential_project_identifiers?
                 else
                   Mailer.with_deliveries(params[:notifications] == '1') do
                     @project = Project.new
                     @project.safe_attributes = params[:project]
                     if @project.copy(@source_project, :only => params[:only])
                       flash[:notice] = l(:notice_successful_create)
                       redirect_to settings_project_path(@project)
                     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 settings_project_path(@project)
                     end
                   end
                 end
               rescue ActiveRecord::RecordNotFound
                 # source_project not found
                 render_404
               end
               # Show @project
               def show
                 # try to redirect to the requested menu item
                 if params[:jump] && redirect_to_project_menu_item(@project, params[:jump])
                   return
                 end
                 @users_by_role = @project.users_by_role
                 @subprojects = @project.children.visible.to_a
                 @news = @project.news.limit(5).includes(:author, :project).reorder("#{News.table_name}.created_on DESC").to_a
                 @trackers = @project.rolled_up_trackers.visible
                 cond = @project.project_condition(Setting.display_subprojects_issues?)
                 @open_issues_by_tracker = Issue.visible.open.where(cond).group(:tracker).count
                 @total_issues_by_tracker = Issue.visible.where(cond).group(:tracker).count
                 if User.current.allowed_to_view_all_time_entries?(@project)
                   @total_hours = TimeEntry.visible.where(cond).sum(:hours).to_f
                 end
                 @key = User.current.rss_key
                 respond_to do |format|
                   format.html
                   format.api
                 end
               end
               def settings
                 @issue_custom_fields = IssueCustomField.sorted.to_a
                 @issue_category ||= IssueCategory.new
                 @member ||= @project.members.new
                 @trackers = Tracker.sorted.to_a
                 @version_status = params[:version_status] || 'open'
                 @version_name = params[:version_name]
                 @versions = @project.shared_versions.status(@version_status).like(@version_name)
                 @wiki ||= @project.wiki || Wiki.new(:project => @project)
               end
               def edit
               end
               def update
                 @project.safe_attributes = params[:project]
                 if @project.save
                   respond_to do |format|
                     format.html {
                       flash[:notice] = l(:notice_successful_update)
                       redirect_to settings_project_path(@project)
                     }
                     format.api  { render_api_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_module_names]
                 flash[:notice] = l(:notice_successful_update)
                 redirect_to settings_project_path(@project, :tab => 'modules')
               end
               def archive
                 unless @project.archive
                   flash[:error] = l(:error_can_not_archive_project)
                 end
                 redirect_to_referer_or admin_projects_path(:status => params[:status])
               end
               def unarchive
                 unless @project.active?
                   @project.unarchive
                 end
                 redirect_to_referer_or admin_projects_path(:status => params[:status])
               end
               def close
                 @project.close
                 redirect_to project_path(@project)
               end
               def reopen
                 @project.reopen
                 redirect_to project_path(@project)
               end
               # Delete @project
               def destroy
                 @project_to_destroy = @project
                 if api_request? || params[:confirm]
                   @project_to_destroy.destroy
                   respond_to do |format|
                     format.html { redirect_to admin_projects_path }
                     format.api  { render_api_ok }
                   end
                 end
                 # hide project in layout
                 @project = nil
               end
             end

General Comments 0

Write
Preview

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

No TODOs yet

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

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