jro_apps/redmine Commit - r574:87bad767c686

app/views/projects/add_issue_category.rhtml created 644 +6 0

			@@ -0,0 +1,6
		1	<h2><%=l(:label_issue_category_new)%></h2>
		2
		3	<% labelled_tabular_form_for :category, @category, :url => { :action => 'add_issue_category' } do \|f\| %>
		4	<%= render :partial => 'issue_categories/form', :locals => { :f => f } %>
		5	<%= submit_tag l(:button_create) %>
		6	<% end %>

db/migrate/058_add_issue_categories_assigned_to_id.rb created 644 +9 0

			@@ -0,0 +1,9
		1	class AddIssueCategoriesAssignedToId < ActiveRecord::Migration
		2	def self.up
		3	add_column :issue_categories, :assigned_to_id, :integer
		4	end
		5
		6	def self.down
		7	remove_column :issue_categories, :assigned_to_id
		8	end
		9	end

test/unit/issue_test.rb created 644 +27 0

			@@ -0,0 +1,27
		1	# redMine - project management software
		2	# Copyright (C) 2006-2007 Jean-Philippe Lang
		3	#
		4	# This program is free software; you can redistribute it and/or
		5	# modify it under the terms of the GNU General Public License
		6	# as published by the Free Software Foundation; either version 2
		7	# of the License, or (at your option) any later version.
		8	#
		9	# This program is distributed in the hope that it will be useful,
		10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	# GNU General Public License for more details.
		13	#
		14	# You should have received a copy of the GNU General Public License
		15	# along with this program; if not, write to the Free Software
		16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
		17
		18	require File.dirname(__FILE__) + '/../test_helper'
		19
		20	class IssueTest < Test::Unit::TestCase
		21	fixtures :projects, :users, :members, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues
		22
		23	def test_category_based_assignment
		24	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)
		25	assert_equal IssueCategory.find(1).assigned_to, issue.assigned_to
		26	end
		27	end

app/controllers/projects_controller.rb +5 -10

                # Add a new issue category to @project
                def add_issue_category
-                 if request.post?
-                   @issue_category = @project.issue_categories.build(params[:issue_category])
-                   if @issue_category.save
-                     flash[:notice] = l(:notice_successful_create)
-                     redirect_to :action => 'settings', :tab => 'categories', :id => @project
-                   else
-                     settings
-                     render :action => 'settings'
-                   end
+                 @category = @project.issue_categories.build(params[:category])
+                 if request.post? and @category.save
+                   flash[:notice] = l(:notice_successful_create)
+                   redirect_to :action => 'settings', :tab => 'categories', :id => @project
                  end
-               end
+               end
                # Add a new version to @project
                def add_version

app/models/issue.rb +7 0

                  end
                end
+               def before_create
+                 # default assignment based on category
+                 if assigned_to.nil? && category && category.assigned_to
+                   self.assigned_to = category.assigned_to
+                 end
+               end
                def before_save
                  if @current_journal
                    # attributes changes

app/models/issue_category.rb +1 0

              class IssueCategory < ActiveRecord::Base
                before_destroy :check_integrity
                belongs_to :project
+               belongs_to :assigned_to, :class_name => 'User', :foreign_key => 'assigned_to_id'
                validates_presence_of :name
                validates_uniqueness_of :name, :scope => [:project_id]

app/models/member.rb +5 0

                def name
                  self.user.display_name
                end
+               def before_destroy
+                 # remove category based auto assignments for this member
+                 project.issue_categories.update_all "assigned_to_id = NULL", ["assigned_to_id = ?", self.user.id]
+               end
              end

app/models/user.rb +1 0

                has_many :memberships, :class_name => 'Member', :include => [ :project, :role ], :conditions => "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}", :order => "#{Project.table_name}.name", :dependent => :delete_all
                has_many :projects, :through => :memberships
                has_many :custom_values, :dependent => :delete_all, :as => :customized
+               has_many :issue_categories, :foreign_key => 'assigned_to_id', :dependent => :nullify
                has_one :preference, :dependent => :destroy, :class_name => 'UserPreference'
                has_one :rss_key, :dependent => :destroy, :class_name => 'Token', :conditions => "action='feeds'"
                belongs_to :auth_source

app/views/issue_categories/_form.rhtml +5 -6

		@@ -1,7 +1,6
1		<%= error_messages_for '~~issue_~~category' %>
2
3		<!--[form:issue_category]-->
4		<p><label for="issue_category_name"><%l(:field_name)%></label>
5		<%= text_field 'issue_category', 'name' %></p>
6		<!--[eoform:issue_category]-->
	1	<%= error_messages_for 'category' %>
7	2
	3	<div class="box">
	4	<p><%= f.text_field :name, :size => 30, :required => true %></p>
	5	<p><%= f.select :assigned_to_id, @project.users.collect{\|u\| [u.name, u.id]}, :include_blank => true %></p>
	6	</div>

app/views/issue_categories/edit.rhtml +3 -3

              <h2><%=l(:label_issue_category)%></h2>
-             <% form_tag({:action => 'edit', :id => @category}, :class => "tabular") do %>
-               <%= render :partial => 'form' %>
-               <%= submit_tag l(:button_save) %>
+             <% labelled_tabular_form_for :category, @category, :url => { :action => 'edit', :id => @category } do |f| %>
+             <%= render :partial => 'issue_categories/form', :locals => { :f => f } %>
+             <%= submit_tag l(:button_create) %>
              <% end %>

app/views/projects/settings.rhtml +13 -22

              <div id="tab-content-categories" class="tab-content" style="display:none;">
              <table class="list">
-             	<thead><th><%= l(:label_issue_category) %></th><th style="width:15%"></th></thead>
+             	<thead>
+             	<th><%= l(:label_issue_category) %></th>
+             	<th><%= l(:field_assigned_to) %></th>
+             	<th style="width:15%"></th>
+             	<th style="width:15%"></th>
+             	</thead>
              	<tbody>
-             <% for @category in @project.issue_categories %>
-             	<% unless @category.new_record? %>
+             <% for category in @project.issue_categories %>
+             	<% unless category.new_record? %>
              	<tr class="<%= cycle 'odd', 'even' %>">
-                 <td>
-                     <% form_tag({:controller => 'issue_categories', :action => 'edit', :id => @category}) do %>
-                     <%= text_field 'category', 'name', :size => 25  %>
-                     <% if authorize_for('issue_categories', 'edit') %>
-                     <%= submit_tag l(:button_save), :class => "button-small" %>
-                     <% end %>
-                     <% end %>
-                 </td>
-                 <td align="center">
-                   <small><%= link_to_if_authorized l(:button_delete), {:controller => 'issue_categories', :action => 'destroy', :id => @category}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %></small>
-                 </td>
+                 <td><%=h(category.name) %></td>
+                 <td><%=h(category.assigned_to.name) if category.assigned_to %></td>
+                 <td align="center"><small><%= link_to_if_authorized l(:button_edit), { :controller => 'issue_categories', :action => 'edit', :id => category }, :class => 'icon icon-edit' %></small></td>
+                 <td align="center"><small><%= link_to_if_authorized l(:button_delete), {:controller => 'issue_categories', :action => 'destroy', :id => category}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %></small></td>
              	</tr>
              	<% end %>
              <% end %>
                  </tbody>
              </table>
              &nbsp;
-             <% if authorize_for('projects', 'add_issue_category') %>
-                 <% form_tag({:action => 'add_issue_category', :tab => 'categories', :id => @project}) do %>
-                 <p><label for="issue_category_name"><%=l(:label_issue_category_new)%></label><br />
-                 <%= error_messages_for 'issue_category' %>
-                 <%= text_field 'issue_category', 'name', :size => 25 %>
-                 <%= submit_tag l(:button_add) %></p>
-                 <% end %>
-             <% end %>
+             <p><%= link_to_if_authorized l(:label_issue_category_new), :controller => 'projects', :action => 'add_issue_category', :id => @project %></p>
              </div>
              <div id="tab-content-boards" class="tab-content" style="display:none;">

test/fixtures/issue_categories.yml +2 0

              issue_categories_001:
                name: Printing
                project_id: 1
+               assigned_to_id: 2
                id: 1
              issue_categories_002:
                name: Recipes
                project_id: 1
+               assigned_to_id:
                id: 2

	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