jro_apps/redmine Commit - r860:0af6f347580d

Jicamarca Repository

0

- This repo
- ?
- Use '/' key to quickly access this field. - Enter a name of repository, or repository group for quick search. - Prefix query to allow special search: user:admin, to search for usernames, always global user_group:devops, to search for user groups, always global pr:303, to search for pull request number, title, or description, always global commit:efced4, to search for commits, scoped to repositories or groups file:models.py, to search for file paths, scoped to repositories or groups For advanced full text search visit: repository search
Home
Public journal
Gists
Sign in

jro_apps » redmine

RSS

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

                 @assignables << @issue.assigned_to if @issue.assigned_to && !@assignables.include?(@issue.assigned_to)
                 @can = {:edit => User.current.allowed_to?(:edit_issues, @project),
                         :change_status => User.current.allowed_to?(:change_issue_status, @project),
+                        :add => User.current.allowed_to?(:add_issues, @project),
                         :move => User.current.allowed_to?(:move_issues, @project),
                         :delete => User.current.allowed_to?(:delete_issues, @project)}
                 render :layout => false

               end
               # Add a new issue to @project
+              # The new issue will be created from an existing one if copy_from parameter is given
               def add_issue
-                @tracker = Tracker.find(params[:tracker_id])
+                @issue = params[:copy_from] ? Issue.new.copy_from(params[:copy_from]) : Issue.new(params[:issue])
-                @priorities = Enumeration::get_values('IPRI')
+                @issue.project = @project
+                @issue.author = User.current
+                @issue.tracker ||= Tracker.find(params[:tracker_id])
                 default_status = IssueStatus.default
                 unless default_status
-                  flash.now[:error] = 'No default issue status defined. Please check your configuration.'
+                  flash.now[:error] = 'No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").'
                   render :nothing => true, :layout => true
                   return
                 end
-                @issue = Issue.new(:project => @project, :tracker => @tracker)
                 @issue.status = default_status
                 @allowed_statuses = ([default_status] + default_status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker))if logged_in_user
                 if request.get?
-                  @issue.start_date = Date.today
+                  @issue.start_date ||= Date.today
-                  @custom_values = @project.custom_fields_for_issues(@tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue) }
+                  @custom_values = @issue.custom_values.empty? ?
+                    @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue) } :
+                    @issue.custom_values
                 else
-                  @issue.attributes = params[:issue]
                   requested_status = IssueStatus.find_by_id(params[:issue][:status_id])
+                  # Check that the user is allowed to apply the requested status
                   @issue.status = (@allowed_statuses.include? requested_status) ? requested_status : default_status
+                  @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
-                  @issue.author_id = self.logged_in_user.id if self.logged_in_user
-                  # Multiple file upload
-                  @attachments = []
-                  params[:attachments].each { |a|
-                    @attachments << Attachment.new(:container => @issue, :file => a, :author => logged_in_user) unless a.size == 0
-                  } if params[:attachments] and params[:attachments].is_a? Array
-                  @custom_values = @project.custom_fields_for_issues(@tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
                   @issue.custom_values = @custom_values
                   if @issue.save
-                    @attachments.each(&:save)
+                    if params[:attachments] && params[:attachments].is_a?(Array)
+                      # Save attachments
+                      params[:attachments].each {|a| Attachment.create(:container => @issue, :file => a, :author => User.current) unless a.size == 0}
+                    end
                     flash[:notice] = l(:notice_successful_create)
                     Mailer.deliver_issue_add(@issue) if Setting.notified_events.include?('issue_added')
                     redirect_to :action => 'list_issues', :id => @project
+                    return
                   end
                 end
+                @priorities = Enumeration::get_values('IPRI')
               end
               # Show filtered/sorted issues list of @project

                 end
               end
+              def copy_from(arg)
+                issue = arg.is_a?(Issue) ? arg : Issue.find(arg)
+                self.attributes = issue.attributes.dup
+                self.custom_values = issue.custom_values.collect {|v| v.clone}
+                self
+              end
               def priority_id=(pid)
                 self.priority = nil
                 write_attribute(:priority_id, pid)

             		                              :selected => @issue.assigned_to.nil?, :disabled => !(@can[:edit] || @can[:change_status]) %></li>
             		</ul>
             	</li>
+            	<li><%= context_menu_link l(:button_copy), {:controller => 'projects', :action => 'add_issue', :id => @project, :copy_from => @issue},
+            	        :class => 'icon-copy', :disabled => !@can[:add] %></li>
             	<li><%= context_menu_link l(:button_move), {:controller => 'projects', :action => 'move_issues', :id => @project, "issue_ids[]" => @issue.id },
             	                          :class => 'icon-move', :disabled => !@can[:move]  %>
                 <li><%= context_menu_link l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue},

             <%= link_to_if_authorized l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue}, :class => 'icon icon-edit', :accesskey => accesskey(:edit) %>
             <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :issue_id => @issue}, :class => 'icon icon-time' %>
             <%= watcher_tag(@issue, User.current) %>
+            <%= link_to_if_authorized l(:button_copy), {:controller => 'projects', :action => 'add_issue', :id => @project, :copy_from => @issue }, :class => 'icon icon-copy' %>
             <%= link_to_if_authorized l(:button_move), {:controller => 'projects', :action => 'move_issues', :id => @project, "issue_ids[]" => @issue.id }, :class => 'icon icon-move' %>
             <%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
             </div>

-            <h2><%=l(:label_issue_new)%>: <%= @tracker.name %></h2>
+            <h2><%=l(:label_issue_new)%>: <%= @issue.tracker %></h2>
             <% labelled_tabular_form_for :issue, @issue,
                                          :url => {:action => 'add_issue'},
                                          :html => {:multipart => true, :id => 'issue-form'} do |f| %>
-                <%= hidden_field_tag 'tracker_id', @tracker.id %>
+                <%= f.hidden_field :tracker_id %>
                 <%= render :partial => 'issues/form', :locals => {:f => f} %>
                 <%= submit_tag l(:button_create) %>
                 <%= link_to_remote l(:label_preview),
                                    { :url => { :controller => 'issues', :action => 'preview', :id => @issue },

             button_reset: Reset
             button_rename: Rename
             button_change_password: Change password
+            button_copy: Copy
             status_active: active
             status_registered: registered

             button_reset: Réinitialiser
             button_rename: Renommer
             button_change_password: Changer de mot de passe
+            button_copy: Copier
             status_active: actif
             status_registered: enregistré

             .icon-add { background-image: url(../images/add.png); }
             .icon-edit { background-image: url(../images/edit.png); }
+            .icon-copy { background-image: url(../images/copy.png); }
             .icon-del { background-image: url(../images/delete.png); }
             .icon-move { background-image: url(../images/move.png); }
             .icon-save { background-image: url(../images/save.png); }

@@ -22,7 +22,7 require 'projects_controller'
22	class ProjectsController; def rescue_action(e) raise e end; end	22	class ProjectsController; def rescue_action(e) raise e end; end
23		23
24	class ProjectsControllerTest < Test::Unit::TestCase	24	class ProjectsControllerTest < Test::Unit::TestCase
25	fixtures :projects, :users, :roles, :enabled_modules, :enumerations	25	fixtures :projects, :users, :roles, :members, :issues, :enabled_modules, :enumerations
26		26
27	def setup	27	def setup
28	@controller = ProjectsController.new	28	@controller = ProjectsController.new
@@ -143,4 +143,23 class ProjectsControllerTest < Test::Unit::TestCase
143	assert_redirected_to 'admin/projects'	143	assert_redirected_to 'admin/projects'
144	assert Project.find(1).active?	144	assert Project.find(1).active?
145	end	145	end
		146
		147	def test_add_issue
		148	@request.session[:user_id] = 2
		149	get :add_issue, :id => 1, :tracker_id => 1
		150	assert_response :success
		151	assert_template 'add_issue'
		152	post :add_issue, :id => 1, :issue => {:tracker_id => 1, :subject => 'This is the test_add_issue issue', :description => 'This is the description', :priority_id => 5}
		153	assert_redirected_to 'projects/list_issues'
		154	assert Issue.find_by_subject('This is the test_add_issue issue')
		155	end
		156
		157	def test_copy_issue
		158	@request.session[:user_id] = 2
		159	get :add_issue, :id => 1, :copy_from => 1
		160	assert_template 'add_issue'
		161	assert_not_nil assigns(:issue)
		162	orig = Issue.find(1)
		163	assert_equal orig.subject, assigns(:issue).subject
		164	end
146	end	165	end

             require File.dirname(__FILE__) + '/../test_helper'
             class IssueTest < Test::Unit::TestCase
-              fixtures :projects, :users, :members, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues
+              fixtures :projects, :users, :members, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :custom_fields, :custom_values
               def test_category_based_assignment
                 issue = Issue.create(:project_id => 1, :tracker_id => 1, :author_id => 3, :status_id => 1, :priority => Enumeration.get_values('IPRI').first, :subject => 'Assignment test', :description => 'Assignment test', :category_id => 1)
                 assert_equal IssueCategory.find(1).assigned_to, issue.assigned_to
               end
+              def test_copy
+                issue = Issue.new.copy_from(1)
+                assert issue.save
+                issue.reload
+                orig = Issue.find(1)
+                assert_equal orig.subject, issue.subject
+                assert_equal orig.tracker, issue.tracker
+                assert_equal orig.custom_values.first.value, issue.custom_values.first.value
+              end
               def test_close_duplicates
                 # Create 3 issues
                 issue1 = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => 1, :status_id => 1, :priority => Enumeration.get_values('IPRI').first, :subject => 'Duplicates test', :description => 'Duplicates test')