(.*?)}m, '[...]') - @content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n> " @content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n" rescue ActiveRecord::RecordNotFound render_404 diff --git a/app/controllers/mail_handler_controller.rb b/app/controllers/mail_handler_controller.rb index ccb832e..389cd6f 100644 --- a/app/controllers/mail_handler_controller.rb +++ b/app/controllers/mail_handler_controller.rb @@ -1,5 +1,7 @@ +# frozen_string_literal: true + # Redmine - project management software -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2019 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 @@ -26,7 +28,7 @@ class MailHandlerController < ActionController::Base def index options = params.dup email = options.delete(:email) - if MailHandler.receive(email, options) + if MailHandler.safe_receive(email, options) head :created else head :unprocessable_entity diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 1583e9e..119bf8e 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -1,5 +1,7 @@ +# frozen_string_literal: true + # Redmine - project management software -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2019 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 diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 76bc19c..bbc6a35 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -1,5 +1,7 @@ +# frozen_string_literal: true + # Redmine - project management software -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2019 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 @@ -63,6 +65,7 @@ class MessagesController < ApplicationController if @message.save call_hook(:controller_messages_new_after_save, { :params => params, :message => @message}) render_attachment_warning_if_needed(@message) + flash[:notice] = l(:notice_successful_create) redirect_to board_message_path(@board, @message) end end @@ -80,6 +83,7 @@ class MessagesController < ApplicationController attachments = Attachment.attach_files(@reply, params[:attachments]) render_attachment_warning_if_needed(@reply) end + flash[:notice] = l(:notice_successful_update) redirect_to board_message_path(@board, @topic, :r => @reply) end @@ -101,6 +105,7 @@ class MessagesController < ApplicationController (render_403; return false) unless @message.destroyable_by?(User.current) r = @message.to_param @message.destroy + flash[:notice] = l(:notice_successful_delete) if @message.parent redirect_to board_message_path(@board, @message.parent, :r => r) else @@ -112,18 +117,23 @@ class MessagesController < ApplicationController @subject = @message.subject @subject = "RE: #{@subject}" unless @subject.starts_with?('RE:') - @content = "#{ll(Setting.default_language, :text_user_wrote, @message.author)}\n> " + if @message.root == @message + @content = +"#{ll(Setting.default_language, :text_user_wrote, @message.author)}\n> " + else + @content = +"#{ll(Setting.default_language, :text_user_wrote_in, {:value => @message.author, :link => "message##{@message.id}"})}\n> " + end @content << @message.content.to_s.strip.gsub(%r{
(.*?)}m, '[...]').gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n" end def preview message = @board.messages.find_by_id(params[:id]) - @text = (params[:message] || params[:reply])[:content] + @text = params[:text] ? params[:text] : nil @previewed = message render :partial => 'common/preview' end -private + private + def find_message return unless find_board @message = @board.messages.includes(:parent).find(params[:id]) diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb index bf04d55..606fd5c 100644 --- a/app/controllers/my_controller.rb +++ b/app/controllers/my_controller.rb @@ -1,5 +1,7 @@ +# frozen_string_literal: true + # Redmine - project management software -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2019 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 @@ -21,13 +23,17 @@ class MyController < ApplicationController # let user change user's password when user has to skip_before_action :check_password_change, :only => :password - require_sudo_mode :account, only: :post + accept_api_auth :account + + require_sudo_mode :account, only: :put require_sudo_mode :reset_rss_key, :reset_api_key, :show_api_key, :destroy helper :issues helper :users helper :custom_fields helper :queries + helper :activities + helper :calendars def index page @@ -45,15 +51,25 @@ class MyController < ApplicationController def account @user = User.current @pref = @user.pref - if request.post? + if request.put? @user.safe_attributes = params[:user] @user.pref.safe_attributes = params[:pref] if @user.save @user.pref.save set_language_if_valid @user.language - flash[:notice] = l(:notice_account_updated) - redirect_to my_account_path + respond_to do |format| + format.html { + flash[:notice] = l(:notice_account_updated) + redirect_to my_account_path + } + format.api { render_api_ok } + end return + else + respond_to do |format| + format.html { render :action => :account } + format.api { render_validation_errors(@user) } + end end end end @@ -95,7 +111,7 @@ class MyController < ApplicationController if @user.save # The session token was destroyed by the password change, generate a new one session[:tk] = @user.generate_session_token - Mailer.password_updated(@user) + Mailer.deliver_password_updated(@user, User.current) flash[:notice] = l(:notice_account_password_updated) redirect_to my_account_path end @@ -138,7 +154,7 @@ class MyController < ApplicationController block_settings = params[:settings] || {} block_settings.each do |block, settings| - @user.pref.update_block_settings(block, settings) + @user.pref.update_block_settings(block, settings.to_unsafe_hash) end @user.pref.save @updated_blocks = block_settings.keys diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb index 3df9e5e..5d63f44 100644 --- a/app/controllers/news_controller.rb +++ b/app/controllers/news_controller.rb @@ -1,5 +1,7 @@ +# frozen_string_literal: true + # Redmine - project management software -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2019 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 @@ -24,7 +26,7 @@ class NewsController < ApplicationController before_action :authorize, :except => [:index] before_action :find_optional_project, :only => :index accept_rss_auth :index - accept_api_auth :index + accept_api_auth :index, :show, :create, :update, :destroy helper :watchers helper :attachments @@ -69,13 +71,21 @@ class NewsController < ApplicationController def create @news = News.new(:project => @project, :author => User.current) @news.safe_attributes = params[:news] - @news.save_attachments(params[:attachments]) + @news.save_attachments(params[:attachments] || (params[:news] && params[:news][:uploads])) if @news.save - render_attachment_warning_if_needed(@news) - flash[:notice] = l(:notice_successful_create) - redirect_to project_news_index_path(@project) + respond_to do |format| + format.html { + render_attachment_warning_if_needed(@news) + flash[:notice] = l(:notice_successful_create) + redirect_to project_news_index_path(@project) + } + format.api { render_api_ok } + end else - render :action => 'new' + respond_to do |format| + format.html { render :action => 'new' } + format.api { render_validation_errors(@news) } + end end end @@ -84,18 +94,29 @@ class NewsController < ApplicationController def update @news.safe_attributes = params[:news] - @news.save_attachments(params[:attachments]) + @news.save_attachments(params[:attachments] || (params[:news] && params[:news][:uploads])) if @news.save - render_attachment_warning_if_needed(@news) - flash[:notice] = l(:notice_successful_update) - redirect_to news_path(@news) + respond_to do |format| + format.html { + render_attachment_warning_if_needed(@news) + flash[:notice] = l(:notice_successful_update) + redirect_to news_path(@news) + } + format.api { render_api_ok } + end else - render :action => 'edit' + respond_to do |format| + format.html { render :action => 'edit' } + format.api { render_validation_errors(@news) } + end end end def destroy @news.destroy - redirect_to project_news_index_path(@project) + respond_to do |format| + format.html { redirect_to project_news_index_path(@project) } + format.api { render_api_ok } + end end end diff --git a/app/controllers/previews_controller.rb b/app/controllers/previews_controller.rb index 37cdc46..f1ef5fa 100644 --- a/app/controllers/previews_controller.rb +++ b/app/controllers/previews_controller.rb @@ -1,5 +1,7 @@ +# frozen_string_literal: true + # Redmine - project management software -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2019 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 @@ -16,28 +18,28 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class PreviewsController < ApplicationController - before_action :find_project, :find_attachments + before_action :find_project, :except => :text + before_action :find_attachments def issue - @issue = Issue.visible.find_by_id(params[:id]) unless params[:id].blank? + @issue = Issue.visible.find_by_id(params[:issue_id]) unless params[:issue_id].blank? if @issue - @description = params[:issue] && params[:issue][:description] - if @description && @description.gsub(/(\r?\n|\n\r?)/, "\n") == @issue.description.to_s.gsub(/(\r?\n|\n\r?)/, "\n") - @description = nil - end - @notes = params[:journal] ? params[:journal][:notes] : nil - @notes ||= params[:issue] ? params[:issue][:notes] : nil - else - @description = (params[:issue] ? params[:issue][:description] : nil) + @previewed = @issue end - render :layout => false + @text = params[:text] ? params[:text] : nil + render :partial => 'common/preview' end def news if params[:id].present? && news = News.visible.find_by_id(params[:id]) @previewed = news end - @text = (params[:news] ? params[:news][:description] : nil) + @text = params[:text] ? params[:text] : nil + render :partial => 'common/preview' + end + + def text + @text = params[:text] ? params[:text] : nil render :partial => 'common/preview' end diff --git a/app/controllers/principal_memberships_controller.rb b/app/controllers/principal_memberships_controller.rb index 924ecbd..fdbd8be 100644 --- a/app/controllers/principal_memberships_controller.rb +++ b/app/controllers/principal_memberships_controller.rb @@ -1,5 +1,7 @@ +# frozen_string_literal: true + # Redmine - project management software -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2019 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 @@ -19,6 +21,8 @@ class PrincipalMembershipsController < ApplicationController layout 'admin' self.main_menu = false + helper :members + before_action :require_admin before_action :find_principal, :only => [:new, :create] before_action :find_membership, :only => [:edit, :update, :destroy] diff --git a/app/controllers/project_enumerations_controller.rb b/app/controllers/project_enumerations_controller.rb index f68d948..8b2768e 100644 --- a/app/controllers/project_enumerations_controller.rb +++ b/app/controllers/project_enumerations_controller.rb @@ -1,5 +1,7 @@ +# frozen_string_literal: true + # Redmine - project management software -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2019 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 @@ -20,15 +22,8 @@ class ProjectEnumerationsController < ApplicationController before_action :authorize def update - if params[:enumerations] - saved = Project.transaction do - params[:enumerations].each do |id, activity| - @project.update_or_create_time_entry_activity(id, activity) - end - end - if saved - flash[:notice] = l(:notice_successful_update) - end + if @project.update_or_create_time_entry_activities(update_params) + flash[:notice] = l(:notice_successful_update) end redirect_to settings_project_path(@project, :tab => 'activities') @@ -41,4 +36,12 @@ class ProjectEnumerationsController < ApplicationController flash[:notice] = l(:notice_successful_update) redirect_to settings_project_path(@project, :tab => 'activities') end + + private + + def update_params + params. + permit(:enumerations => [:parent_id, :active, {:custom_field_values => {}}]). + require(:enumerations) + end end diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 3e3fc69..c5c98d6 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -1,5 +1,7 @@ +# frozen_string_literal: true + # Redmine - project management software -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2019 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 @@ -31,8 +33,12 @@ class ProjectsController < ApplicationController helper :custom_fields helper :issues helper :queries + include QueriesHelper + helper :projects_queries + include ProjectsQueriesHelper helper :repositories helper :members + helper :trackers # Lists visible projects def index @@ -41,14 +47,19 @@ class ProjectsController < ApplicationController return end - scope = Project.visible.sorted + retrieve_project_query + scope = project_scope respond_to do |format| format.html { - unless params[:closed] - scope = scope.active + # TODO: see what to do with the board view and pagination + if @query.display_type == 'board' + @entries = scope.to_a + else + @entry_count = scope.count + @entry_pages = Paginator.new @entry_count, per_page_option, params['page'] + @entries = scope.offset(@entry_pages.offset).limit(@entry_pages.per_page).to_a end - @projects = scope.to_a } format.api { @offset, @limit = api_offset_and_limit @@ -59,6 +70,11 @@ class ProjectsController < ApplicationController 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)}") } + format.csv { + # Export all entries + @entries = scope.to_a + send_data(query_to_csv(@entries, @query, params), :type => 'text/csv; header=present', :filename => 'projects.csv') + } end end @@ -158,6 +174,7 @@ class ProjectsController < ApplicationController if User.current.allowed_to_view_all_time_entries?(@project) @total_hours = TimeEntry.visible.where(cond).sum(:hours).to_f + @total_estimated_hours = Issue.visible.where(cond).sum(:estimated_hours).to_f end @key = User.current.rss_key @@ -176,8 +193,7 @@ class ProjectsController < ApplicationController @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) + @versions = @project.shared_versions.status(@version_status).like(@version_name).sorted end def edit @@ -189,7 +205,7 @@ class ProjectsController < ApplicationController respond_to do |format| format.html { flash[:notice] = l(:notice_successful_update) - redirect_to settings_project_path(@project) + redirect_to settings_project_path(@project, params[:tab]) } format.api { render_api_ok } end @@ -204,12 +220,6 @@ class ProjectsController < ApplicationController 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) @@ -224,6 +234,19 @@ class ProjectsController < ApplicationController redirect_to_referer_or admin_projects_path(:status => params[:status]) end + def bookmark + jump_box = Redmine::ProjectJumpBox.new User.current + if request.delete? + jump_box.delete_project_bookmark @project + elsif request.post? + jump_box.bookmark_project @project + end + respond_to do |format| + format.js + format.html { redirect_to project_path(@project) } + end + end + def close @project.close redirect_to project_path(@project) @@ -247,4 +270,15 @@ class ProjectsController < ApplicationController # hide project in layout @project = nil end + + private + + # Returns the ProjectEntry scope for index + def project_scope(options={}) + @query.results_scope(options) + end + + def retrieve_project_query + retrieve_query(ProjectQuery, false, :defaults => @default_columns_names) + end end diff --git a/app/controllers/queries_controller.rb b/app/controllers/queries_controller.rb index 54f695f..56283dc 100644 --- a/app/controllers/queries_controller.rb +++ b/app/controllers/queries_controller.rb @@ -1,5 +1,7 @@ +# frozen_string_literal: true + # Redmine - project management software -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2019 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 @@ -104,6 +106,10 @@ class QueriesController < ApplicationController render_404 end + def current_menu_item + @query ? @query.queried_class.to_s.underscore.pluralize.to_sym : nil + end + private def find_query @@ -114,18 +120,11 @@ class QueriesController < ApplicationController render_404 end - def find_optional_project - @project = Project.find(params[:project_id]) if params[:project_id] - render_403 unless User.current.allowed_to?(:save_queries, @project, :global => true) - rescue ActiveRecord::RecordNotFound - render_404 - end - def update_query_from_params @query.project = params[:query_is_for_all] ? nil : @project @query.build_from_params(params) @query.column_names = nil if params[:default_columns] - @query.sort_criteria = params[:query] && params[:query][:sort_criteria] + @query.sort_criteria = (params[:query] && params[:query][:sort_criteria]) || @query.sort_criteria @query.name = params[:query] && params[:query][:name] if User.current.allowed_to?(:manage_public_queries, @query.project) || User.current.admin? @query.visibility = (params[:query] && params[:query][:visibility]) || Query::VISIBILITY_PRIVATE @@ -157,6 +156,10 @@ class QueriesController < ApplicationController redirect_to _time_entries_path(@project, nil, options) end + def redirect_to_project_query(options) + redirect_to projects_path(options) + end + # Returns the Query subclass, IssueQuery by default # for compatibility with previous behaviour def query_class diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb index 08c30ef..6918cb3 100644 --- a/app/controllers/reports_controller.rb +++ b/app/controllers/reports_controller.rb @@ -1,5 +1,7 @@ +# frozen_string_literal: true + # Redmine - project management software -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2019 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 @@ -21,55 +23,56 @@ class ReportsController < ApplicationController def issue_report @trackers = @project.rolled_up_trackers(false).visible - @versions = @project.shared_versions.sort + @versions = @project.shared_versions.sorted @priorities = IssuePriority.all.reverse @categories = @project.issue_categories - @assignees = (Setting.issue_group_assignment? ? @project.principals : @project.users).sort - @authors = @project.users.sort + @assignees = (Setting.issue_group_assignment? ? @project.principals : @project.users).sorted + @authors = @project.users.sorted @subprojects = @project.descendants.visible - - @issues_by_tracker = Issue.by_tracker(@project) - @issues_by_version = Issue.by_version(@project) - @issues_by_priority = Issue.by_priority(@project) - @issues_by_category = Issue.by_category(@project) - @issues_by_assigned_to = Issue.by_assigned_to(@project) - @issues_by_author = Issue.by_author(@project) + with_subprojects = Setting.display_subprojects_issues? + @issues_by_tracker = Issue.by_tracker(@project, with_subprojects) + @issues_by_version = Issue.by_version(@project, with_subprojects) + @issues_by_priority = Issue.by_priority(@project, with_subprojects) + @issues_by_category = Issue.by_category(@project, with_subprojects) + @issues_by_assigned_to = Issue.by_assigned_to(@project, with_subprojects) + @issues_by_author = Issue.by_author(@project, with_subprojects) @issues_by_subproject = Issue.by_subproject(@project) || [] render :template => "reports/issue_report" end def issue_report_details + with_subprojects = Setting.display_subprojects_issues? case params[:detail] when "tracker" @field = "tracker_id" @rows = @project.rolled_up_trackers(false).visible - @data = Issue.by_tracker(@project) + @data = Issue.by_tracker(@project, with_subprojects) @report_title = l(:field_tracker) when "version" @field = "fixed_version_id" - @rows = @project.shared_versions.sort - @data = Issue.by_version(@project) + @rows = @project.shared_versions.sorted + @data = Issue.by_version(@project, with_subprojects) @report_title = l(:field_version) when "priority" @field = "priority_id" @rows = IssuePriority.all.reverse - @data = Issue.by_priority(@project) + @data = Issue.by_priority(@project, with_subprojects) @report_title = l(:field_priority) when "category" @field = "category_id" @rows = @project.issue_categories - @data = Issue.by_category(@project) + @data = Issue.by_category(@project, with_subprojects) @report_title = l(:field_category) when "assigned_to" @field = "assigned_to_id" - @rows = (Setting.issue_group_assignment? ? @project.principals : @project.users).sort - @data = Issue.by_assigned_to(@project) + @rows = (Setting.issue_group_assignment? ? @project.principals : @project.users).sorted + @data = Issue.by_assigned_to(@project, with_subprojects) @report_title = l(:field_assigned_to) when "author" @field = "author_id" - @rows = @project.users.sort - @data = Issue.by_author(@project) + @rows = @project.users.sorted + @data = Issue.by_author(@project, with_subprojects) @report_title = l(:field_author) when "subproject" @field = "project_id" @@ -84,6 +87,6 @@ class ReportsController < ApplicationController private def find_issue_statuses - @statuses = IssueStatus.sorted.to_a + @statuses = @project.rolled_up_statuses.sorted.to_a end end diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 29a3b59..ef903f2 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -1,5 +1,7 @@ +# frozen_string_literal: true + # Redmine - project management software -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2019 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 @@ -15,13 +17,11 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -require 'SVG/Graph/Bar' -require 'SVG/Graph/BarHorizontal' require 'digest/sha1' require 'redmine/scm/adapters' -class ChangesetNotFound < Exception; end -class InvalidRevisionParam < Exception; end +class ChangesetNotFound < StandardError; end +class InvalidRevisionParam < StandardError; end class RepositoriesController < ApplicationController menu_item :repository @@ -148,6 +148,13 @@ class RepositoriesController < ApplicationController send_opt[:disposition] = disposition(@path) send_data @repository.cat(@path, @rev), send_opt else + # set up pagination from entry to entry + parent_path = @path.split('/')[0...-1].join('/') + @entries = @repository.entries(parent_path, @rev).reject(&:is_dir?) + if index = @entries.index{|e| e.name == @entry.name} + @paginator = Redmine::Pagination::Paginator.new(@entries.size, 1, index+1) + end + if !@entry.size || @entry.size <= Setting.file_max_size_displayed.to_i.kilobyte content = @repository.cat(@path, @rev) (show_error_not_found; return) unless content @@ -232,7 +239,7 @@ class RepositoriesController < ApplicationController if params[:format] == 'diff' @diff = @repository.diff(@path, @rev, @rev_to) (show_error_not_found; return) unless @diff - filename = "changeset_r#{@rev}" + filename = +"changeset_r#{@rev}" filename << "_r#{@rev_to}" if @rev_to send_data @diff.join, :filename => "#{filename}.diff", :type => 'text/x-patch', @@ -250,18 +257,20 @@ class RepositoriesController < ApplicationController Digest::MD5.hexdigest("#{@path}-#{@rev}-#{@rev_to}-#{@diff_type}-#{current_language}") unless read_fragment(@cache_key) @diff = @repository.diff(@path, @rev, @rev_to) - show_error_not_found unless @diff + (show_error_not_found; return) unless @diff end @changeset = @repository.find_changeset_by_name(@rev) @changeset_to = @rev_to ? @repository.find_changeset_by_name(@rev_to) : nil @diff_format_revisions = @repository.diff_format_revisions(@changeset, @changeset_to) + render :diff, :formats => :html, :layout => 'base.html.erb' end end def stats end + # Returns JSON data for repository graphs def graph data = nil case params[:graph] @@ -271,8 +280,7 @@ class RepositoriesController < ApplicationController data = graph_commits_per_author(@repository) end if data - headers["Content-Type"] = "image/svg+xml" - send_data(data, :type => "image/svg+xml", :disposition => "inline") + render :json => data else render_404 end @@ -313,7 +321,7 @@ class RepositoriesController < ApplicationController @rev = params[:rev].blank? ? @repository.default_branch : params[:rev].to_s.strip @rev_to = params[:rev_to] - unless @rev.to_s.match(REV_PARAM_RE) && @rev_to.to_s.match(REV_PARAM_RE) + unless REV_PARAM_RE.match?(@rev.to_s) && REV_PARAM_RE.match?(@rev_to.to_s) if @repository.branches.blank? raise InvalidRevisionParam end @@ -341,55 +349,37 @@ class RepositoriesController < ApplicationController end def graph_commits_per_month(repository) - @date_to = User.current.today - @date_from = @date_to << 11 - @date_from = Date.civil(@date_from.year, @date_from.month, 1) + date_to = User.current.today + date_from = date_to << 11 + date_from = Date.civil(date_from.year, date_from.month, 1) commits_by_day = Changeset. - where("repository_id = ? AND commit_date BETWEEN ? AND ?", repository.id, @date_from, @date_to). + where("repository_id = ? AND commit_date BETWEEN ? AND ?", repository.id, date_from, date_to). group(:commit_date). count commits_by_month = [0] * 12 - commits_by_day.each {|c| commits_by_month[(@date_to.month - c.first.to_date.month) % 12] += c.last } + commits_by_day.each {|c| commits_by_month[(date_to.month - c.first.to_date.month) % 12] += c.last } changes_by_day = Change. joins(:changeset). - where("#{Changeset.table_name}.repository_id = ? AND #{Changeset.table_name}.commit_date BETWEEN ? AND ?", repository.id, @date_from, @date_to). + where("#{Changeset.table_name}.repository_id = ? AND #{Changeset.table_name}.commit_date BETWEEN ? AND ?", repository.id, date_from, date_to). group(:commit_date). count changes_by_month = [0] * 12 - changes_by_day.each {|c| changes_by_month[(@date_to.month - c.first.to_date.month) % 12] += c.last } + changes_by_day.each {|c| changes_by_month[(date_to.month - c.first.to_date.month) % 12] += c.last } fields = [] today = User.current.today 12.times {|m| fields << month_name(((today.month - 1 - m) % 12) + 1)} - graph = SVG::Graph::Bar.new( - :height => 300, - :width => 800, - :fields => fields.reverse, - :stack => :side, - :scale_integers => true, - :step_x_labels => 2, - :show_data_values => false, - :graph_title => l(:label_commits_per_month), - :show_graph_title => true - ) - - graph.add_data( - :data => commits_by_month[0..11].reverse, - :title => l(:label_revision_plural) - ) - - graph.add_data( - :data => changes_by_month[0..11].reverse, - :title => l(:label_change_plural) - ) - - graph.burn + data = { + :labels => fields.reverse, + :commits => commits_by_month[0..11].reverse, + :changes => changes_by_month[0..11].reverse + } end def graph_commits_per_author(repository) - #data + # data stats = repository.stats_by_author fields, commits_data, changes_data = [], [], [] stats.each do |name, hsh| @@ -398,7 +388,7 @@ class RepositoriesController < ApplicationController changes_data << hsh[:changes_count] end - #expand to 10 values if needed + # expand to 10 values if needed fields = fields + [""]*(10 - fields.length) if fields.length<10 commits_data = commits_data + [0]*(10 - commits_data.length) if commits_data.length<10 changes_data = changes_data + [0]*(10 - changes_data.length) if changes_data.length<10 @@ -406,27 +396,11 @@ class RepositoriesController < ApplicationController # Remove email address in usernames fields = fields.collect {|c| c.gsub(%r{<.+@.+>}, '') } - #prepare graph - graph = SVG::Graph::BarHorizontal.new( - :height => 30 * commits_data.length, - :width => 800, - :fields => fields, - :stack => :side, - :scale_integers => true, - :show_data_values => false, - :rotate_y_labels => false, - :graph_title => l(:label_commits_per_author), - :show_graph_title => true - ) - graph.add_data( - :data => commits_data, - :title => l(:label_revision_plural) - ) - graph.add_data( - :data => changes_data, - :title => l(:label_change_plural) - ) - graph.burn + data = { + :labels => fields.reverse, + :commits => commits_data.reverse, + :changes => changes_data.reverse + } end def disposition(path) diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb index b85c51b..0e29e8c 100644 --- a/app/controllers/roles_controller.rb +++ b/app/controllers/roles_controller.rb @@ -1,5 +1,7 @@ +# frozen_string_literal: true + # Redmine - project management software -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2019 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 @@ -101,16 +103,22 @@ class RolesController < ApplicationController end def permissions - @roles = Role.sorted.to_a - @permissions = Redmine::AccessControl.permissions.select { |p| !p.public? } - if request.post? - @roles.each do |role| - role.permissions = params[:permissions][role.id.to_s] - role.save - end - flash[:notice] = l(:notice_successful_update) - redirect_to roles_path + scope = Role.sorted + if params[:ids].present? + scope = scope.where(:id => params[:ids]) end + @roles = scope.to_a + @permissions = Redmine::AccessControl.permissions.select { |p| !p.public? } + end + + def update_permissions + @roles = Role.where(:id => params[:permissions].keys) + @roles.each do |role| + role.permissions = params[:permissions][role.id.to_s] + role.save + end + flash[:notice] = l(:notice_successful_update) + redirect_to roles_path end private diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index ce9e21f..2e81281 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -1,5 +1,7 @@ +# frozen_string_literal: true + # Redmine - project management software -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2019 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 @@ -16,12 +18,11 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class SearchController < ApplicationController - before_action :find_optional_project + before_action :find_optional_project_by_id, :authorize_global accept_api_auth :index def index - @question = params[:q] || "" - @question.strip! + @question = params[:q]&.strip || "" @all_words = params[:all_words] ? params[:all_words].present? : true @titles_only = params[:titles_only] ? params[:titles_only].present? : false @search_attachments = params[:attachments].presence || '0' @@ -68,7 +69,7 @@ class SearchController < ApplicationController fetcher = Redmine::Search::Fetcher.new( @question, User.current, @scope, projects_to_search, :all_words => @all_words, :titles_only => @titles_only, :attachments => @search_attachments, :open_issues => @open_issues, - :cache => params[:page].present?, :params => params + :cache => params[:page].present?, :params => params.to_unsafe_hash ) if fetcher.tokens.present? @@ -87,13 +88,4 @@ class SearchController < ApplicationController format.api { @results ||= []; render :layout => false } end end - -private - def find_optional_project - return true unless params[:id] - @project = Project.find(params[:id]) - check_project_privacy - rescue ActiveRecord::RecordNotFound - render_404 - end end diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb index 7b2dceb..4ff333b 100644 --- a/app/controllers/settings_controller.rb +++ b/app/controllers/settings_controller.rb @@ -1,5 +1,7 @@ +# frozen_string_literal: true + # Redmine - project management software -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2019 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 @@ -34,7 +36,7 @@ class SettingsController < ApplicationController def edit @notifiables = Redmine::Notifiable.all if request.post? - errors = Setting.set_all_from_params(params[:settings]) + errors = Setting.set_all_from_params(params[:settings].to_unsafe_hash) if errors.blank? flash[:notice] = l(:notice_successful_update) redirect_to settings_path(:tab => params[:tab]) @@ -46,7 +48,7 @@ class SettingsController < ApplicationController end @options = {} - user_format = User::USER_FORMATS.collect{|key, value| [key, value[:setting_order]]}.sort{|a, b| a[1] <=> b[1]} + user_format = User::USER_FORMATS.collect{|key, value| [key, value[:setting_order]]}.sort_by{|f| f[1]} @options[:user_format] = user_format.collect{|f| [User.current.name(f[0]), f[0].to_s]} @deliveries = ActionMailer::Base.perform_deliveries diff --git a/app/controllers/sys_controller.rb b/app/controllers/sys_controller.rb index bd8238a..f217ee2 100644 --- a/app/controllers/sys_controller.rb +++ b/app/controllers/sys_controller.rb @@ -1,5 +1,7 @@ +# frozen_string_literal: true + # Redmine - project management software -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2019 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 @@ -38,7 +40,7 @@ class SysController < ActionController::Base repository.safe_attributes = params[:repository] repository.project = project if repository.save - render :json => {repository.class.name.underscore.gsub('/', '-') => {:id => repository.id, :url => repository.url}}, :status => 201 + render :json => {repository.class.name.underscore.tr('/', '-') => {:id => repository.id, :url => repository.url}}, :status => 201 else head 422 end @@ -50,7 +52,7 @@ class SysController < ActionController::Base scope = Project.active.has_module(:repository) if params[:id] project = nil - if params[:id].to_s =~ /^\d*$/ + if /^\d*$/.match?(params[:id].to_s) project = scope.find(params[:id]) else project = scope.find_by_identifier(params[:id]) diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb index df6b618..1d144b9 100644 --- a/app/controllers/timelog_controller.rb +++ b/app/controllers/timelog_controller.rb @@ -1,5 +1,7 @@ +# frozen_string_literal: true + # Redmine - project management software -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2019 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 @@ -25,7 +27,6 @@ class TimelogController < ApplicationController before_action :find_optional_issue, :only => [:new, :create] before_action :find_optional_project, :only => [:index, :report] - before_action :authorize_global, :only => [:new, :create, :index, :report] accept_rss_auth :index accept_api_auth :index, :show, :create, :update, :destroy @@ -91,12 +92,12 @@ class TimelogController < ApplicationController end def new - @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => User.current.today) + @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :author => User.current, :spent_on => User.current.today) @time_entry.safe_attributes = params[:time_entry] end def create - @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => User.current.today) + @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :author => User.current, :user => User.current, :spent_on => User.current.today) @time_entry.safe_attributes = params[:time_entry] if @time_entry.project && !User.current.allowed_to?(:log_time, @time_entry.project) render_403 @@ -146,7 +147,6 @@ class TimelogController < ApplicationController def update @time_entry.safe_attributes = params[:time_entry] - call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry }) if @time_entry.save @@ -166,8 +166,18 @@ class TimelogController < ApplicationController end def bulk_edit - @available_activities = @projects.map(&:activities).reduce(:&) + @target_projects = Project.allowed_to(:log_time).to_a @custom_fields = TimeEntry.first.available_custom_fields.select {|field| field.format.bulk_edit_supported} + if params[:time_entry] + @target_project = @target_projects.detect {|p| p.id.to_s == params[:time_entry][:project_id].to_s} + end + if @target_project + @available_activities = @target_project.activities + else + @available_activities = @projects.map(&:activities).reduce(:&) + end + @time_entry_params = params[:time_entry] || {} + @time_entry_params[:custom_field_values] ||= {} end def bulk_update @@ -230,7 +240,8 @@ class TimelogController < ApplicationController end end -private + private + def find_time_entry @time_entry = TimeEntry.find(params[:id]) @project = @time_entry.project @@ -262,25 +273,18 @@ private if params[:issue_id].present? @issue = Issue.find(params[:issue_id]) @project = @issue.project + authorize else find_optional_project end end - def find_optional_project - if params[:project_id].present? - @project = Project.find(params[:project_id]) - end - rescue ActiveRecord::RecordNotFound - render_404 - end - # Returns the TimeEntry scope for index and report actions def time_entry_scope(options={}) @query.results_scope(options) end def retrieve_time_entry_query - retrieve_query(TimeEntryQuery, false) + retrieve_query(TimeEntryQuery, false, :defaults => @default_columns_names) end end diff --git a/app/controllers/trackers_controller.rb b/app/controllers/trackers_controller.rb index caf6b11..e219dea 100644 --- a/app/controllers/trackers_controller.rb +++ b/app/controllers/trackers_controller.rb @@ -1,5 +1,7 @@ +# frozen_string_literal: true + # Redmine - project management software -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2019 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 @@ -32,7 +34,7 @@ class TrackersController < ApplicationController end def new - @tracker ||= Tracker.new + @tracker ||= Tracker.new(:default_status => IssueStatus.sorted.first) @tracker.safe_attributes = params[:tracker] @trackers = Tracker.sorted.to_a @projects = Project.all diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 0133f97..ec9ecba 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,5 +1,7 @@ +# frozen_string_literal: true + # Redmine - project management software -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2019 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 @@ -28,7 +30,10 @@ class UsersController < ApplicationController include SortHelper helper :custom_fields include CustomFieldsHelper + include UsersHelper helper :principal_memberships + helper :activities + include ActivitiesHelper require_sudo_mode :create, :update, :destroy @@ -59,6 +64,9 @@ class UsersController < ApplicationController @groups = Group.givable.sort render :layout => !request.xhr? } + format.csv { + send_data(users_to_csv(scope.order(sort_clause)), :type => 'text/csv; header=present', :filename => 'users.csv') + } format.api end end @@ -72,6 +80,16 @@ class UsersController < ApplicationController # show projects based on current user visibility @memberships = @user.memberships.preload(:roles, :project).where(Project.visible_condition(User.current)).to_a + @issue_counts = {} + @issue_counts[:assigned] = { + :total => Issue.visible.assigned_to(@user).count, + :open => Issue.visible.open.assigned_to(@user).count + } + @issue_counts[:reported] = { + :total => Issue.visible.where(:author_id => @user.id).count, + :open => Issue.visible.open.where(:author_id => @user.id).count + } + respond_to do |format| format.html { events = Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 10) @@ -95,13 +113,13 @@ class UsersController < ApplicationController @user.pref.safe_attributes = params[:pref] if @user.save - Mailer.account_information(@user, @user.password).deliver if params[:send_information] + Mailer.deliver_account_information(@user, @user.password) if params[:send_information] respond_to do |format| format.html { flash[:notice] = l(:notice_user_successful_create, :id => view_context.link_to(@user.login, user_path(@user))) if params[:continue] - attrs = params[:user].slice(:generate_password) + attrs = {:generate_password => @user.generate_password } redirect_to new_user_path(:user => attrs) else redirect_to edit_user_path(@user) @@ -140,9 +158,9 @@ class UsersController < ApplicationController @user.pref.save if was_activated - Mailer.account_activated(@user).deliver + Mailer.deliver_account_activated(@user) elsif @user.active? && params[:send_information] && @user != User.current - Mailer.account_information(@user, @user.password).deliver + Mailer.deliver_account_information(@user, @user.password) end respond_to do |format| diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb index a536416..15c24a8 100644 --- a/app/controllers/versions_controller.rb +++ b/app/controllers/versions_controller.rb @@ -1,5 +1,7 @@ +# frozen_string_literal: true + # Redmine - project management software -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2019 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 @@ -34,7 +36,7 @@ class VersionsController < ApplicationController @trackers = @project.trackers.sorted.to_a retrieve_selected_tracker_ids(@trackers, @trackers.select {|t| t.is_in_roadmap?}) @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1') - project_ids = @with_subprojects ? @project.self_and_descendants.collect(&:id) : [@project.id] + project_ids = @with_subprojects ? @project.self_and_descendants.pluck(:id) : [@project.id] @versions = @project.shared_versions.preload(:custom_values) @versions += @project.rolled_up_versions.visible.preload(:custom_values) if @with_subprojects diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb index 3f080e9..f0692e3 100644 --- a/app/controllers/watchers_controller.rb +++ b/app/controllers/watchers_controller.rb @@ -1,5 +1,7 @@ +# frozen_string_literal: true + # Redmine - project management software -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2019 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 diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index 341a64d..571e233 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -1,5 +1,7 @@ +# frozen_string_literal: true + # Redmine - project management software -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2019 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 diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb index 134765e..423f94f 100644 --- a/app/controllers/wiki_controller.rb +++ b/app/controllers/wiki_controller.rb @@ -1,5 +1,7 @@ +# frozen_string_literal: true + # Redmine - project management software -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2019 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 @@ -42,8 +44,6 @@ class WikiController < ApplicationController helper :watchers include Redmine::Export::PDF - include ActionView::Helpers::SanitizeHelper - # List of pages, sorted alphabetically and by parent (hierarchy) def index load_pages_for_index @@ -72,7 +72,7 @@ class WikiController < ApplicationController @page.title = '' unless editable? @page.validate if @page.errors[:title].blank? - path = project_wiki_page_path(@project, @page.title) + path = project_wiki_page_path(@project, @page.title, :parent => params[:parent]) respond_to do |format| format.html { redirect_to path } format.js { render :js => "window.location = #{path.to_json}" } @@ -109,7 +109,7 @@ class WikiController < ApplicationController send_data(export, :type => 'text/html', :filename => filename_for_content_disposition("#{@page.title}.html")) return elsif params[:format] == 'txt' - send_data(strip_tags(@content.text), :type => 'text/plain', :filename => filename_for_content_disposition("#{@page.title}.txt")) + send_data(@content.text, :type => 'text/plain', :filename => filename_for_content_disposition("#{@page.title}.txt")) return end end @@ -325,7 +325,7 @@ class WikiController < ApplicationController @attachments += page.attachments @previewed = page.content end - @text = params[:content][:text] + @text = params[:content].present? ? params[:content][:text] : params[:text] render :partial => 'common/preview' end @@ -336,7 +336,7 @@ class WikiController < ApplicationController redirect_to :action => 'show', :id => @page.title, :project_id => @project end -private + private def find_wiki @project = Project.find(params[:project_id]) diff --git a/app/controllers/wikis_controller.rb b/app/controllers/wikis_controller.rb index c61c2f9..3c1637e 100644 --- a/app/controllers/wikis_controller.rb +++ b/app/controllers/wikis_controller.rb @@ -1,5 +1,7 @@ +# frozen_string_literal: true + # Redmine - project management software -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2019 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 @@ -19,13 +21,6 @@ class WikisController < ApplicationController menu_item :settings before_action :find_project, :authorize - # Create or update a project's wiki - def edit - @wiki = @project.wiki || Wiki.new(:project => @project) - @wiki.safe_attributes = params[:wiki] - @wiki.save if request.post? - end - # Delete a project's wiki def destroy if request.post? && params[:confirm] && @project.wiki diff --git a/app/controllers/workflows_controller.rb b/app/controllers/workflows_controller.rb index c831827..0c29b14 100644 --- a/app/controllers/workflows_controller.rb +++ b/app/controllers/workflows_controller.rb @@ -1,5 +1,7 @@ +# frozen_string_literal: true + # Redmine - project management software -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2019 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 @@ -118,7 +120,7 @@ class WorkflowsController < ApplicationController def find_roles ids = Array.wrap(params[:role_id]) if ids == ['all'] - @roles = Role.sorted.to_a + @roles = Role.sorted.select(&:consider_workflow?) elsif ids.present? @roles = Role.where(:id => ids).to_a end diff --git a/app/helpers/account_helper.rb b/app/helpers/account_helper.rb index e4d8222..1e8de67 100644 --- a/app/helpers/account_helper.rb +++ b/app/helpers/account_helper.rb @@ -1,7 +1,7 @@ -# encoding: utf-8 -# +# frozen_string_literal: true + # Redmine - project management software -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2019 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 diff --git a/app/helpers/activities_helper.rb b/app/helpers/activities_helper.rb index 54e5580..573e432 100644 --- a/app/helpers/activities_helper.rb +++ b/app/helpers/activities_helper.rb @@ -1,7 +1,7 @@ -# encoding: utf-8 -# +# frozen_string_literal: true + # Redmine - project management software -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2019 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 @@ -21,9 +21,9 @@ module ActivitiesHelper def sort_activity_events(events) events_by_group = events.group_by(&:event_group) sorted_events = [] - events.sort {|x, y| y.event_datetime <=> x.event_datetime}.each do |event| + events.sort_by(&:event_datetime).reverse_each do |event| if group_events = events_by_group.delete(event.event_group) - group_events.sort {|x, y| y.event_datetime <=> x.event_datetime}.each_with_index do |e, i| + group_events.sort_by(&:event_datetime).reverse.each_with_index do |e, i| sorted_events << [e, i > 0] end end diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb index e972ef0..a06852b 100644 --- a/app/helpers/admin_helper.rb +++ b/app/helpers/admin_helper.rb @@ -1,7 +1,7 @@ -# encoding: utf-8 -# +# frozen_string_literal: true + # Redmine - project management software -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2019 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 diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 792af98..e8284a0 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,7 +1,7 @@ -# encoding: utf-8 -# +# frozen_string_literal: true + # Redmine - project management software -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2019 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 @@ -23,7 +23,6 @@ require 'cgi' module ApplicationHelper include Redmine::WikiFormatting::Macros::Definitions include Redmine::I18n - include GravatarHelper::PublicMethods include Redmine::Pagination::Helper include Redmine::SudoMode::Helper include Redmine::Themes::Helper @@ -53,7 +52,8 @@ module ApplicationHelper if user.is_a?(User) name = h(user.name(options[:format])) if user.active? || (User.current.admin? && user.logged?) - link_to name, user_path(user), :class => user.css_classes + only_path = options[:only_path].nil? ? true : options[:only_path] + link_to name, user_url(user, :only_path => only_path), :class => user.css_classes else name end @@ -62,6 +62,20 @@ module ApplicationHelper end end + # Displays a link to edit group page if current user is admin + # Otherwise display only the group name + def link_to_group(group, options={}) + if group.is_a?(Group) + name = h(group.name) + if User.current.admin? + only_path = options[:only_path].nil? ? true : options[:only_path] + link_to name, edit_group_path(group, :only_path => only_path) + else + name + end + end + end + # Displays a link to +issue+ with its subject. # Examples: # @@ -97,10 +111,17 @@ module ApplicationHelper # * :download - Force download (default: false) def link_to_attachment(attachment, options={}) text = options.delete(:text) || attachment.filename - route_method = options.delete(:download) ? :download_named_attachment_url : :named_attachment_url - html_options = options.slice!(:only_path) + if options.delete(:download) + route_method = :download_named_attachment_url + options[:filename] = attachment.filename + else + route_method = :attachment_url + # make sure we don't have an extraneous :filename in the options + options.delete(:filename) + end + html_options = options.slice!(:only_path, :filename) options[:only_path] = true unless options.key?(:only_path) - url = send(route_method, attachment, attachment.filename, options) + url = send(route_method, attachment, options) link_to text, url, html_options end @@ -146,8 +167,8 @@ module ApplicationHelper h(project.name) else link_to project.name, - project_url(project, {:only_path => true}.merge(options)), - html_options + project_url(project, {:only_path => true}.merge(options)), + html_options end end @@ -169,6 +190,39 @@ module ApplicationHelper link_to_if version.visible?, format_version_name(version), version_path(version), options end + RECORD_LINK = { + 'CustomValue' => -> (custom_value) { link_to_record(custom_value.customized) }, + 'Document' => -> (document) { link_to(document.title, document_path(document)) }, + 'Group' => -> (group) { link_to(group.name, group_path(group)) }, + 'Issue' => -> (issue) { link_to_issue(issue, :subject => false) }, + 'Message' => -> (message) { link_to_message(message) }, + 'News' => -> (news) { link_to(news.title, news_path(news)) }, + 'Project' => -> (project) { link_to_project(project) }, + 'User' => -> (user) { link_to_user(user) }, + 'Version' => -> (version) { link_to_version(version) }, + 'WikiPage' => -> (wiki_page) { link_to(wiki_page.pretty_title, project_wiki_page_path(wiki_page.project, wiki_page.title)) } + } + + def link_to_record(record) + if link = RECORD_LINK[record.class.name] + self.instance_exec(record, &link) + end + end + + ATTACHMENT_CONTAINER_LINK = { + # Custom list, since project/version attachments are listed in the files + # view and not in the project/milestone view + 'Project' => -> (project) { link_to(l(:project_module_files), project_files_path(project)) }, + 'Version' => -> (version) { link_to(l(:project_module_files), project_files_path(version.project)) }, + } + + def link_to_attachment_container(attachment_container) + if link = ATTACHMENT_CONTAINER_LINK[attachment_container.class.name] || + RECORD_LINK[attachment_container.class.name] + self.instance_exec(attachment_container, &link) + end + end + # Helper that formats object for html or text rendering def format_object(object, html=true, &block) if block_given? @@ -228,22 +282,57 @@ module ApplicationHelper :srcset => "#{thumbnail_path(attachment, :size => thumbnail_size * 2)} 2x", :style => "max-width: #{thumbnail_size}px; max-height: #{thumbnail_size}px;" ), - named_attachment_path( - attachment, - attachment.filename + attachment_path( + attachment ), :title => attachment.filename ) end def toggle_link(name, id, options={}) - onclick = "$('##{id}').toggle(); " + onclick = +"$('##{id}').toggle(); " onclick << (options[:focus] ? "$('##{options[:focus]}').focus(); " : "this.blur(); ") onclick << "$(window).scrollTop($('##{options[:focus]}').position().top); " if options[:scroll] onclick << "return false;" link_to(name, "#", :onclick => onclick) end + def link_to_previous_month(year, month, options={}) + target_year, target_month = if month == 1 + [year - 1, 12] + else + [year, month - 1] + end + + name = if target_month == 12 + "#{month_name(target_month)} #{target_year}" + else + month_name(target_month) + end + + link_to_month(("« " + name), target_year, target_month, options) + end + + def link_to_next_month(year, month, options={}) + target_year, target_month = if month == 12 + [year + 1, 1] + else + [year, month + 1] + end + + name = if target_month == 1 + "#{month_name(target_month)} #{target_year}" + else + month_name(target_month) + end + + link_to_month((name + " »"), target_year, target_month, options) + end + + def link_to_month(link_name, year, month, options={}) + link_to(link_name, {:params => request.query_parameters.merge(:year => year, :month => month)}, options) + end + # Used to format item titles on the activity view def format_activity_title(text) text @@ -281,19 +370,19 @@ module ApplicationHelper # The given collection may be a subset of the whole project tree # (eg. some intermediate nodes are private and can not be seen) def render_project_nested_lists(projects, &block) - s = '' + s = +'' if projects.any? ancestors = [] original_project = @project projects.sort_by(&:lft).each do |project| # set the project environment to please macros. @project = project - if (ancestors.empty? || project.is_descendant_of?(ancestors.last)) + if ancestors.empty? || project.is_descendant_of?(ancestors.last) s << "
diff --git a/app/views/account/register.html.erb b/app/views/account/register.html.erb index ade00ad..f35e0e0 100644 --- a/app/views/account/register.html.erb +++ b/app/views/account/register.html.erb @@ -8,8 +8,11 @@
<%= f.text_field :login, :size => 25, :required => true %>
<%= f.password_field :password, :size => 25, :required => true %> - <%= l(:text_caracters_minimum, :count => Setting.password_min_length) %>
- + <%= l(:text_caracters_minimum, :count => Setting.password_min_length) %> + <% if Setting.password_required_char_classes.any? %> + <%= l(:text_characters_must_contain, :character_classes => Setting.password_required_char_classes.collect{|c| l("label_password_char_class_#{c}")}.join(", ")) %> + <% end %> +<%= f.password_field :password_confirmation, :size => 25, :required => true %>
<% end %> diff --git a/app/views/activities/_activities.html.erb b/app/views/activities/_activities.html.erb new file mode 100644 index 0000000..aaeea76 --- /dev/null +++ b/app/views/activities/_activities.html.erb @@ -0,0 +1,17 @@ +<%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>
-<%= f.text_field :name, :required => true %>
<%= f.text_field :host, :required => true %>
-<%= f.text_field :port, :required => true, :size => 6 %> <%= f.check_box :tls, :no_label => true %> LDAPS
++ <%= f.text_field :port, :required => true, :size => 6 %> + <%= f.select :ldap_mode, AuthSourceLdap::LDAP_MODES.map { |m| [l("label_#{m}"), m] }, :no_label => true %> + <%= l("label_ldaps_warning") %> +
<%= f.text_field :account %>
<%= f.password_field :account_password, :label => :field_password, :name => 'dummy_password', diff --git a/app/views/auto_completes/issues.html.erb b/app/views/auto_completes/issues.html.erb deleted file mode 100644 index 35f9387..0000000 --- a/app/views/auto_completes/issues.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -<%= raw @issues.map {|issue| { - 'id' => issue.id, - 'label' => "#{issue.tracker} ##{issue.id}: #{issue.subject.to_s.truncate(60)}", - 'value' => issue.id - } - }.to_json -%> diff --git a/app/views/boards/index.html.erb b/app/views/boards/index.html.erb index 21280e1..89df7aa 100644 --- a/app/views/boards/index.html.erb +++ b/app/views/boards/index.html.erb @@ -1,3 +1,9 @@ +
| <% 7.times do |i| %> | <%= day_name( (calendar.first_wday+i)%7 ) %> | <% end %>#{(day+(11-day.cwday)%7).cweek} | ".html_safe) if day.cwday == calendar.first_wday %> -+ |
<%= day.day %> <% calendar.events_on(day).each do |i| %> <% if i.is_a? Issue %> -
+
<% else %>
@@ -30,3 +33,5 @@ end %>
|
|---|
+ <% if download_link %> + <%= t(:label_no_preview_alternative_html, link: download_link) %> + <% else %> + <%= l(:label_no_preview) %> + <% end %> +
+ diff --git a/app/views/common/_other.html.erb b/app/views/common/_other.html.erb index 74d87a6..bb72ec3 100644 --- a/app/views/common/_other.html.erb +++ b/app/views/common/_other.html.erb @@ -1,7 +1,23 @@ -- <% if defined? download_link %> - <%= t(:label_no_preview_alternative_html, link: download_link) %> +<% download_link = nil unless defined? download_link %> +<% kind = nil unless defined? kind %> +<% path = nil unless defined? path %> + +<% if path.present? %> + + <% if kind == 'video' %> + <%= content_tag :video, class: 'filecontent', src: path, controls: true do %> + <%= render partial: 'common/no_preview', locals: { download_link: download_link } %> + <% end %> + <% elsif kind == 'audio' %> + <%= content_tag :audio, class: 'filecontent', src: path, controls: true do %> + <%= render partial: 'common/no_preview', locals: { download_link: download_link } %> + <% end %> <% else %> - <%= l(:label_no_preview) %> - <% end %> -
+ <%= render partial: 'common/no_preview', locals: { download_link: download_link } %> + <% end %> + +<% else %> + + <%= render partial: 'common/no_preview', locals: { download_link: download_link } %> + +<% end %> diff --git a/app/views/common/_preview.html.erb b/app/views/common/_preview.html.erb index 90d83ce..472b0eb 100644 --- a/app/views/common/_preview.html.erb +++ b/app/views/common/_preview.html.erb @@ -1,3 +1,5 @@ - +<% unless @text.blank? %> + <%= textilizable @text, :attachments => @attachments, :object => @previewed %> +<% else %> +<%= l(:label_nothing_to_preview) %>
+<% end %> \ No newline at end of file diff --git a/app/views/common/_tabs.html.erb b/app/views/common/_tabs.html.erb index 1b880c9..def21ff 100644 --- a/app/views/common/_tabs.html.erb +++ b/app/views/common/_tabs.html.erb @@ -1,10 +1,14 @@ +<% default_action = false %> +<%= @message %>
<% end %> + +<% if @archived_project && User.current.admin? %> +<%= link_to l(:button_unarchive), unarchive_project_path(@archived_project), :method => :post, :class => 'icon icon-unlock' %>
+<% end %> + <% html_title @status %> diff --git a/app/views/common/feed.atom.builder b/app/views/common/feed.atom.builder index 893400d..804ecfd 100644 --- a/app/views/common/feed.atom.builder +++ b/app/views/common/feed.atom.builder @@ -1,3 +1,5 @@ +# frozen_string_literal: true + xml.instruct! xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do xml.title truncate_single_line_raw(@title, 100) diff --git a/app/views/context_menus/issues.html.erb b/app/views/context_menus/issues.html.erb index 244f9c5..f957783 100644 --- a/app/views/context_menus/issues.html.erb +++ b/app/views/context_menus/issues.html.erb @@ -3,10 +3,10 @@ <% if @issue -%><%= f.select :field_format, custom_field_formats_for_select(@custom_field), {}, :disabled => !@custom_field.new_record? %>
@@ -19,115 +20,49 @@ <%= call_hook(:view_custom_fields_form_upper_box, :custom_field => @custom_field, :form => f) %><%= submit_tag l(:button_save) %>
++ <% if @custom_field.new_record? %> + <%= submit_tag l(:button_create) %> + <%= submit_tag l(:button_create_and_continue), :name => 'continue' %> + <% else %> + <%= submit_tag l(:button_save) %> + <% end %> +
<%= f.check_box :is_required %>
- <% if @custom_field.format.is_filter_supported %> -<%= f.check_box :is_filter %>
- <% end %> - <% if @custom_field.format.searchable_supported %> -<%= f.check_box :searchable %>
- <% end %> - -<% when "UserCustomField" %> -<%= f.check_box :is_required %>
-<%= f.check_box :visible %>
-<%= f.check_box :editable %>
- <% if @custom_field.format.is_filter_supported %> -<%= f.check_box :is_filter %>
- <% end %> - -<% when "ProjectCustomField" %> -<%= f.check_box :is_required %>
-<%= f.check_box :visible %>
- <% if @custom_field.format.searchable_supported %> -<%= f.check_box :searchable %>
- <% end %> - <% if @custom_field.format.is_filter_supported %> -<%= f.check_box :is_filter %>
- <% end %> - -<% when "VersionCustomField" %> -<%= f.check_box :is_required %>
- <% if @custom_field.format.is_filter_supported %> -<%= f.check_box :is_filter %>
- <% end %> - -<% when "GroupCustomField" %> -<%= f.check_box :is_required %>
- <% if @custom_field.format.is_filter_supported %> -<%= f.check_box :is_filter %>
- <% end %> - -<% when "TimeEntryCustomField" %> -<%= f.check_box :is_required %>
- <% if @custom_field.format.is_filter_supported %> -<%= f.check_box :is_filter %>
- <% end %> - -<% else %> +<%= f.check_box :is_required %>
-<% end %> -<%= call_hook(:"view_custom_fields_form_#{@custom_field.type.to_s.underscore}", :custom_field => @custom_field, :form => f) %> -<%= check_all_links 'custom_field_tracker_ids' %>
- - -<% end %> + <%= render :partial => 'visibility_by_project_selector', :locals => { :f => f } %> + <% end %> +<%= l(:label_custom_field_select_type) %>:
- <% custom_field_type_options.each do |name, type| %> - - <% end %> + <%= select_type_radio_buttons(params[:tab]) %>
<%= submit_tag l(:label_next).html_safe + " »".html_safe, :name => nil %>
diff --git a/app/views/documents/_form.html.erb b/app/views/documents/_form.html.erb index bd3b7cd..b8b8c84 100644 --- a/app/views/documents/_form.html.erb +++ b/app/views/documents/_form.html.erb @@ -3,7 +3,12 @@<%= f.select :category_id, DocumentCategory.active.collect {|c| [c.name, c.id]} %>
<%= f.text_field :title, :required => true, :size => 60 %>
-<%= f.text_area :description, :cols => 60, :rows => 15, :class => 'wiki-edit' %>
+<%= f.text_area :description, :cols => 60, :rows => 15, :class => 'wiki-edit', + :data => { + :auto_complete => true, + :issues_url => auto_complete_issues_path(:project_id => @project, :q => '') + } +%>
<% @document.custom_field_values.each do |value| %><%= custom_field_tag_with_label :document, value %>
diff --git a/app/views/documents/index.html.erb b/app/views/documents/index.html.erb index fc4090f..c0458f8 100644 --- a/app/views/documents/index.html.erb +++ b/app/views/documents/index.html.erb @@ -18,7 +18,7 @@ <% if @grouped.empty? %><%= l(:label_no_data) %>
<% end %> -<% @grouped.keys.sort.each do |group| %> +<% @grouped.keys.sort.__send__(@sort_by == 'date' ? :reverse_each : :each) do |group| %><%= l(:notice_gantt_chart_truncated, :max => @gantt.max_rows) %>
<% end %> -| + | <% style = "" style += "position:relative;" style += "height: #{t_height + 24}px;" style += "width: #{subject_width + 1}px;" %> - <%= content_tag(:div, :style => style, :class => "gantt_subjects_container") do %> + <%= content_tag(:div, :style => style, :class => "gantt_subjects_container #{'draw_selected_columns' if @query.draw_selected_columns}") do %> <% style = "" - style += "right:-2px;" - style += "width: #{subject_width}px;" + style += "width: #{subject_width + 1}px;" style += "height: #{headers_height}px;" style += 'background: #eee;' %> <%= content_tag(:div, "", :style => style, :class => "gantt_hdr") %> <% style = "" - style += "right:-2px;" - style += "width: #{subject_width}px;" + style += "z-index: 1;" + style += "width: #{subject_width + 1}px;" style += "height: #{t_height}px;" - style += 'border-left: 1px solid #c0c0c0;' style += 'overflow: hidden;' %> <%= content_tag(:div, "", :style => style, :class => "gantt_hdr") %> <%= content_tag(:div, :class => "gantt_subjects") do %> - <%= @gantt.subjects.html_safe %> + <%= form_tag({}, :data => {:cm_url => issues_context_menu_path}) do -%> + <%= hidden_field_tag 'back_url', url_for(:params => request.query_parameters), :id => nil %> + <%= @gantt.subjects.html_safe %> + <% end %> <% end %> <% end %> | - +<% @query.columns.each do |column| %> + <% next if Redmine::Helpers::Gantt::UNAVAILABLE_COLUMNS.include?(column.name) %> ++ <% + style = "position: relative;" + style += "height: #{t_height + 24}px;" + %> + <%= content_tag(:div, :style => style, :class => "gantt_#{column.name}_container gantt_selected_column_container") do %> + <% + style = "height: #{t_height}px;" + style += 'overflow: hidden;' + %> + <%= content_tag(:div, '', :style => style, :class => "gantt_hdr") %> + <% + style = "height: #{headers_height}px;" + style += 'background: #eee;' + %> + <%= content_tag(:div, content_tag(:p, column.caption, :class => 'gantt_hdr_selected_column_name'), :style => style, :class => "gantt_hdr") %> + <%= content_tag(:div, :class => "gantt_#{column.name} gantt_selected_column_content") do %> + <%= @gantt.selected_column_content({:column => column, :top => headers_height + 8, :zoom => zoom, :g_width => g_width}).html_safe %> + <% end %> + <% end %> + | +<% end %>
<%
@@ -266,7 +315,7 @@
wday = 1 if wday > 7
%>
<% end %>
-<% end %>
+<% end %>
<% ###### Days headers ####### %>
<% if show_days %>
@@ -299,7 +348,10 @@
<% end %>
<% end %>
-<%= @gantt.lines.html_safe %>
+<%= form_tag({}, :data => {:cm_url => issues_context_menu_path}) do -%>
+ <%= hidden_field_tag 'back_url', url_for(:params => request.query_parameters), :id => nil %>
+ <%= @gantt.lines.html_safe %>
+<% end %>
<% ###### Today red line (excluded from cache) ###### %>
<% if User.current.today >= @gantt.date_from and User.current.today <= @gantt.date_to %>
@@ -329,20 +381,19 @@
|
| - <%= link_to("\xc2\xab " + l(:label_previous), - {:params => request.query_parameters.merge(@gantt.params_previous)}, - :accesskey => accesskey(:previous)) %> - | -- <%= link_to(l(:label_next) + " \xc2\xbb", - {:params => request.query_parameters.merge(@gantt.params_next)}, - :accesskey => accesskey(:next)) %> - | -
- + <%= select_tag 'import_settings[mapping][project_id]', options_for_select(project_tree_options_for_select(@import.allowed_target_projects, :selected => @import.project)), :id => 'import_mapping_project_id' %>
- + <%= mapping_select_tag @import, 'tracker', :required => true, :values => @import.allowed_target_trackers.sorted.map {|t| [t.name, t.id]} %>
- + <%= mapping_select_tag @import, 'status' %>
++ + <%= mapping_select_tag @import, 'unique_id' %> +
+- + <%= mapping_select_tag @import, 'subject', :required => true %>
- + <%= mapping_select_tag @import, 'description' %>
- + <%= mapping_select_tag @import, 'priority' %>
- + <%= mapping_select_tag @import, 'category' %> <% if User.current.allowed_to?(:manage_categories, @import.project) %>
- + <%= mapping_select_tag @import, 'assigned_to' %>
- + <%= mapping_select_tag @import, 'fixed_version' %> <% if User.current.allowed_to?(:manage_versions, @import.project) %>
<% @custom_fields.each do |field| %>- + <%= mapping_select_tag @import, "cf_#{field.id}" %>
<% end %> @@ -62,27 +74,27 @@- + <%= mapping_select_tag @import, 'is_private' %>
- + <%= mapping_select_tag @import, 'parent_issue_id' %>
- + <%= mapping_select_tag @import, 'start_date' %>
- + <%= mapping_select_tag @import, 'due_date' %>
- + <%= mapping_select_tag @import, 'estimated_hours' %>
- + <%= mapping_select_tag @import, 'done_ratio' %>
<%= link_to l(:label_issue_view_all), issues_path(:set_filter => 1, :status_id => '*', :issue_id => saved_objects.map(&:id).join(',')) %>
diff --git a/app/views/imports/_issues_sidebar.html.erb b/app/views/imports/_issues_sidebar.html.erb new file mode 100644 index 0000000..e098175 --- /dev/null +++ b/app/views/imports/_issues_sidebar.html.erb @@ -0,0 +1,3 @@ +<% content_for :sidebar do %> + <%= render :partial => 'issues/sidebar' %> +<% end %> diff --git a/app/views/imports/_time_entries_fields_mapping.html.erb b/app/views/imports/_time_entries_fields_mapping.html.erb new file mode 100644 index 0000000..65d6d09 --- /dev/null +++ b/app/views/imports/_time_entries_fields_mapping.html.erb @@ -0,0 +1,48 @@ ++ + <%= select_tag 'import_settings[mapping][project_id]', + options_for_select(project_tree_options_for_select(@import.allowed_target_projects, :selected => @import.project)), + :id => 'import_mapping_project_id' %> +
++ + <%= mapping_select_tag @import, 'activity', :required => true, + :values => @import.allowed_target_activities.sorted.map {|t| [t.name, t.id]} %> +
+ ++ + <%= mapping_select_tag @import, 'user_id', :required => true, + :values => @import.allowed_target_users.map {|u| [u.name, u.id]}, :default_value => "value:#{User.current.id}" %> +
+ <% end %> ++ + <%= mapping_select_tag @import, 'issue_id' %> +
++ + <%= mapping_select_tag @import, 'spent_on', :required => true %> +
++ + <%= mapping_select_tag @import, 'hours', :required => true %> +
++ + <%= mapping_select_tag @import, 'comments' %> +
++ + <%= mapping_select_tag @import, "cf_#{field.id}", :required => field.is_required? %> +
+ <% end %> +| <%= t(:field_project) %> | +<%= t(:field_user) %> | +<%= t(:field_activity) %> | +<%= t(:field_issue) %> | +<%= t(:field_spent_on) %> | +<%= t(:field_hours) %> | +<%= t(:field_comments) %> | +
|---|---|---|---|---|---|---|
| <%= link_to_project(time_entry.project, :jump => 'time_entries') if time_entry.project %> | +<%= link_to_user time_entry.user %> | +<%= time_entry.activity.name if time_entry.activity %> | +<%= link_to_issue time_entry.issue if time_entry.issue %> | +<%= format_date(time_entry.spent_on) %> | +<%= l_hours_short(time_entry.hours) %> | +<%= time_entry.comments %> | +
<%= button_tag("\xc2\xab " + l(:label_previous), :name => 'previous') %> @@ -28,25 +23,13 @@
<% end %> -<% content_for :sidebar do %> - <%= render :partial => 'issues/sidebar' %> -<% end %> - +<%= render :partial => "#{import_partial_prefix}_sidebar" %> <%= javascript_tag do %> $(document).ready(function() { - $('#fields-mapping').on('change', '#import_mapping_project_id, #import_mapping_tracker', function(){ - $.ajax({ - url: '<%= import_mapping_path(@import, :format => 'js') %>', - type: 'post', - data: $('#import-form').serialize() - }); - }); - $('#import-form').submit(function(){ $('#import-details').show().addClass('ajax-loading'); $('#import-progress').progressbar({value: 0, max: <%= @import.total_items || 0 %>}); }); - }); <% end %> diff --git a/app/views/imports/mapping.js.erb b/app/views/imports/mapping.js.erb index 8fdf14a..4a43584 100644 --- a/app/views/imports/mapping.js.erb +++ b/app/views/imports/mapping.js.erb @@ -1 +1 @@ -$('#fields-mapping').html('<%= escape_javascript(render :partial => 'fields_mapping') %>'); +<%= render :partial => "#{import_partial_prefix}_mapping" %> diff --git a/app/views/imports/new.html.erb b/app/views/imports/new.html.erb index e20be35..e7ca824 100644 --- a/app/views/imports/new.html.erb +++ b/app/views/imports/new.html.erb @@ -1,6 +1,8 @@ -<%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), {:required => true}, - :onchange => "updateIssueFrom('#{escape_javascript update_issue_form_path(@project, @issue)}', this)" %>
+ :onchange => "updateIssueFrom('#{escape_javascript(update_issue_form_path(@project, @issue))}', this)" %> <%= hidden_field_tag 'was_default_status', @issue.status_id, :id => nil if @issue.status == @issue.default_status %> <% else %><%= @issue.status %>
@@ -15,11 +15,14 @@ <% end %> <% if @issue.safe_attribute? 'assigned_to_id' %> -<%= f.select :assigned_to_id, principals_options_for_select(@issue.assignable_users, @issue.assigned_to), :include_blank => true, :required => @issue.required_attribute?('assigned_to_id') %>
+<%= f.select :assigned_to_id, principals_options_for_select(@issue.assignable_users, @issue.assigned_to), + :include_blank => true, :required => @issue.required_attribute?('assigned_to_id') %>
<% end %> <% if @issue.safe_attribute?('category_id') && @issue.project.issue_categories.any? %> -<%= f.select :category_id, (@issue.project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true, :required => @issue.required_attribute?('category_id') %> +
<%= f.select :category_id, (@issue.project.issue_categories.collect {|c| [c.name, c.id]}), + {:include_blank => true, :required => @issue.required_attribute?('category_id')}, + :onchange => ("updateIssueFrom('#{escape_javascript(update_issue_form_path(@project, @issue))}', this)" if @issue.new_record?) %> <%= link_to(l(:label_issue_category_new), new_project_issue_category_path(@issue.project), :remote => true, @@ -31,7 +34,8 @@ <% end %> <% if @issue.safe_attribute?('fixed_version_id') && @issue.assignable_versions.any? %> -
<%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version), :include_blank => true, :required => @issue.required_attribute?('fixed_version_id') %> +
<%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version), + :include_blank => true, :required => @issue.required_attribute?('fixed_version_id') %> <%= link_to(l(:label_version_new), new_project_version_path(@issue.project), :remote => true, @@ -46,8 +50,9 @@
<%= f.text_field :parent_issue_id, :size => 10, :required => @issue.required_attribute?('parent_issue_id') %>
-<%= javascript_tag "observeAutocompleteField('issue_parent_issue_id', '#{escape_javascript auto_complete_issues_path(:project_id => @issue.project, :scope => Setting.cross_project_subtasks, :status => @issue.closed? ? 'c' : 'o', :issue_id => @issue.id)}')" %> +<%= f.text_field :parent_issue_id, :size => 10, + :required => @issue.required_attribute?('parent_issue_id') %>
+<%= javascript_tag "observeAutocompleteField('issue_parent_issue_id', '#{escape_javascript(auto_complete_issues_path(:project_id => @issue.project, :scope => Setting.cross_project_subtasks, :status => @issue.closed? ? 'c' : 'o', :issue_id => @issue.id))}')" %> <% end %> <% if @issue.safe_attribute? 'start_date' %> diff --git a/app/views/issues/_changesets.html.erb b/app/views/issues/_changesets.html.erb deleted file mode 100644 index a407a90..0000000 --- a/app/views/issues/_changesets.html.erb +++ /dev/null @@ -1,18 +0,0 @@ -<% changesets.each do |changeset| %> -<%= link_to_revision(changeset, changeset.repository,
- :text => "#{l(:label_revision)} #{changeset.format_identifier}") %>
- <% if changeset.filechanges.any? && User.current.allowed_to?(:browse_repository, changeset.project) %>
- (<%= link_to(l(:label_diff),
- :controller => 'repositories',
- :action => 'diff',
- :id => changeset.project,
- :repository_id => changeset.repository.identifier_param,
- :path => "",
- :rev => changeset.identifier) %>)
- <% end %>
-
-