jro_apps/redmine Commit - r2227:c9d4d3a2be3d

Merged r2209 to r2211 from trunk....

Jean-Philippe Lang -

r2227:c9d4d3a2be3d

parent child

Context file:

r2227:c9d4d3a2be3d

Collapse all files

test/fixtures/mail_handler/ticket_with_custom_fields.eml created 644 +41 0

			@@ -0,0 +1,41
		1	Return-Path: <jsmith@somenet.foo>
		2	Received: from osiris ([127.0.0.1])
		3	by OSIRIS
		4	with hMailServer ; Sun, 22 Jun 2008 12:28:07 +0200
		5	Message-ID: <000501c8d452$a95cd7e0$0a00a8c0@osiris>
		6	From: "John Smith" <jsmith@somenet.foo>
		7	To: <redmine@somenet.foo>
		8	Subject: New ticket with custom field values
		9	Date: Sun, 22 Jun 2008 12:28:07 +0200
		10	MIME-Version: 1.0
		11	Content-Type: text/plain;
		12	format=flowed;
		13	charset="iso-8859-1";
		14	reply-type=original
		15	Content-Transfer-Encoding: 7bit
		16	X-Priority: 3
		17	X-MSMail-Priority: Normal
		18	X-Mailer: Microsoft Outlook Express 6.00.2900.2869
		19	X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.2869
		20
		21	Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas imperdiet
		22	turpis et odio. Integer eget pede vel dolor euismod varius. Phasellus
		23	blandit eleifend augue. Nulla facilisi. Duis id diam. Class aptent taciti
		24	sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. In
		25	in urna sed tellus aliquet lobortis. Morbi scelerisque tortor in dolor. Cras
		26	sagittis odio eu lacus. Aliquam sem tortor, consequat sit amet, vestibulum
		27	id, iaculis at, lectus. Fusce tortor libero, congue ut, euismod nec, luctus
		28	eget, eros. Pellentesque tortor enim, feugiat in, dignissim eget, tristique
		29	sed, mauris. Pellentesque habitant morbi tristique senectus et netus et
		30	malesuada fames ac turpis egestas. Quisque sit amet libero. In hac habitasse
		31	platea dictumst.
		32
		33	Nulla et nunc. Duis pede. Donec et ipsum. Nam ut dui tincidunt neque
		34	sollicitudin iaculis. Duis vitae dolor. Vestibulum eget massa. Sed lorem.
		35	Nullam volutpat cursus erat. Cras felis dolor, lacinia quis, rutrum et,
		36	dictum et, ligula. Sed erat nibh, gravida in, accumsan non, placerat sed,
		37	massa. Sed sodales, ante fermentum ultricies sollicitudin, massa leo
		38	pulvinar dui, a gravida orci mi eget odio. Nunc a lacus.
		39
		40	category: Stock management
		41	searchable field: Value for a custom field

app/controllers/attachments_controller.rb +3 -1

                end
                def download
-                 @attachment.increment_download if @attachment.container.is_a?(Version)
+                 if @attachment.container.is_a?(Version) || @attachment.container.is_a?(Project)
+                   @attachment.increment_download
+                 end
                  # images are sent inline
                  send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),

app/controllers/projects_controller.rb +5 0

                # Show @project
                def show
+                 if params[:jump]
+                   # try to redirect to the requested menu item
+                   redirect_to_project_menu_item(@project, params[:jump]) && return
+                 end
                  @members_by_role = @project.members.find(:all, :include => [:user, :role], :order => 'position').group_by {|m| m.role}
                  @subprojects = @project.children.find(:all, :conditions => Project.visible_by(User.current))
                  @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")

app/models/mail_handler.rb +9 -2

                  end
                  issue.subject = email.subject.chomp.toutf8
                  issue.description = plain_text_body
+                 # custom fields
+                 issue.custom_field_values = issue.available_custom_fields.inject({}) do |h, c|
+                   if value = get_keyword(c.name, :override => true)
+                     h[c.id] = value
+                   end
+                   h
+                 end
                  issue.save!
                  add_attachments(issue)
                  logger.info "MailHandler: issue ##{issue.id} created by #{user}" if logger && logger.info
                  end
                end
-               def get_keyword(attr)
-                 if @@handler_options[:allow_override].include?(attr.to_s) && plain_text_body =~ /^#{attr}:[ \t]*(.+)$/i
+               def get_keyword(attr, options={})
+                 if (options[:override] || @@handler_options[:allow_override].include?(attr.to_s)) && plain_text_body =~ /^#{attr}:[ \t]*(.+)$/i
                    $1.strip
                  elsif !@@handler_options[:issue][attr].blank?
                    @@handler_options[:issue][attr]

app/views/layouts/_project_selector.rhtml +2 -2

              <option selected="selected"><%= l(:label_jump_to_a_project) %></option>
              <option disabled="disabled">---</option>
              <% user_projects_by_root.keys.sort.each do |root| %>
-                 <%= content_tag('option', h(root.name), :value => url_for(:controller => 'projects', :action => 'show', :id => root)) %>
+                 <%= content_tag('option', h(root.name), :value => url_for(:controller => 'projects', :action => 'show', :id => root, :jump => current_menu_item)) %>
                  <% user_projects_by_root[root].sort.each do |project| %>
                      <% next if project == root %>
-                     <%= content_tag('option', ('&#187; ' + h(project.name)), :value => url_for(:controller => 'projects', :action => 'show', :id => project)) %>
+                     <%= content_tag('option', ('&#187; ' + h(project.name)), :value => url_for(:controller => 'projects', :action => 'show', :id => project, :jump => current_menu_item)) %>
                  <% end %>
              <% end %>
              </select>

lib/redmine/menu_manager.rb +13 -2

                    # Returns the menu item name according to the current action
                    def current_menu_item
-                     menu_items[controller_name.to_sym][:actions][action_name.to_sym] ||
-                       menu_items[controller_name.to_sym][:default]
+                     @current_menu_item ||= menu_items[controller_name.to_sym][:actions][action_name.to_sym] ||
+                                              menu_items[controller_name.to_sym][:default]
+                   end
+                   # Redirects user to the menu item of the given project
+                   # Returns false if user is not authorized
+                   def redirect_to_project_menu_item(project, name)
+                     item = Redmine::MenuManager.items(:project_menu).detect {|i| i.name.to_s == name.to_s}
+                     if item && User.current.allowed_to?(item.url, project) && (item.condition.nil? || item.condition.call(project))
+                       redirect_to({item.param => project}.merge(item.url))
+                       return true
+                     end
+                     false
                    end
                  end

test/functional/projects_controller_test.rb +17 0

                  assert Project.find(1).active?
                end
+               def test_jump_should_redirect_to_active_tab
+                 get :show, :id => 1, :jump => 'issues'
+                 assert_redirected_to 'projects/ecookbook/issues'
+               end
+               def test_jump_should_not_redirect_to_inactive_tab
+                 get :show, :id => 3, :jump => 'documents'
+                 assert_response :success
+                 assert_template 'show'
+               end
+               def test_jump_should_not_redirect_to_unknown_tab
+                 get :show, :id => 3, :jump => 'foobar'
+                 assert_response :success
+                 assert_template 'show'
+               end
                def test_project_menu
                  assert_no_difference 'Redmine::MenuManager.items(:project_menu).size' do
                    Redmine::MenuManager.map :project_menu do |menu|

test/unit/mail_handler_test.rb +12 -1

                                 :trackers,
                                 :projects_trackers,
                                 :enumerations,
-                                :issue_categories
+                                :issue_categories,
+                                :custom_fields,
+                                :custom_fields_trackers
                FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures/mail_handler'
                  assert_equal 10790, issue.attachments.first.filesize
                end
+               def test_add_issue_with_custom_fields
+                 issue = submit_email('ticket_with_custom_fields.eml', :issue => {:project => 'onlinestore'})
+                 assert issue.is_a?(Issue)
+                 assert !issue.new_record?
+                 issue.reload
+                 assert_equal 'New ticket with custom field values', issue.subject
+                 assert_equal 'Value for a custom field', issue.custom_value_for(CustomField.find_by_name('Searchable field')).value
+               end
                def test_add_issue_with_cc
                  issue = submit_email('ticket_with_cc.eml', :issue => {:project => 'ecookbook'})
                  assert issue.is_a?(Issue)

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