# HG changeset patch # User Chris Cannam # Date 1295877793 0 # Node ID e47742d68d2d9323d204683ba7e7f3a68949988d # Parent 5f4f786486d109104bc0d6b5291f39ac3b2e34ee# Parent 4272e09f4b5fd1bf93eb86fa4b3888e219810c9d Merge from branch "cannam-pre-20110113-merge" diff -r 4272e09f4b5f -r e47742d68d2d app/controllers/issues_controller.rb --- a/app/controllers/issues_controller.rb Thu Jan 20 10:01:33 2011 +0000 +++ b/app/controllers/issues_controller.rb Mon Jan 24 14:03:13 2011 +0000 @@ -135,15 +135,12 @@ call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue}) - # Adds user to watcher's list - # @issue.add_watcher(User.current) - # Also adds the assignee to the watcher's list - # if params[:issue][:assigned_to_id] && !params[:issue][:assigned_to_id].empty?: - # unless @issue.watcher_ids.include?(params[:issue][:assigned_to_id]): - # @issue.add_watcher(User.find(params[:issue][:assigned_to_id])) - # end - # end + if params[:issue][:assigned_to_id] && !params[:issue][:assigned_to_id].empty?: + unless @issue.watcher_ids.include?(params[:issue][:assigned_to_id]): + @issue.add_watcher(User.find(params[:issue][:assigned_to_id])) + end + end respond_to do |format| format.html { @@ -291,11 +288,11 @@ # is in this issues watcher's list # if not, adds it. - # if params[:issue][:assigned_to_id] && !params[:issue][:assigned_to_id].empty?: - # unless @issue.watcher_ids.include?(params[:issue][:assigned_to_id]): - # @issue.add_watcher(User.find(params[:issue][:assigned_to_id])) - # end - # end + if params[:issue][:assigned_to_id] && !params[:issue][:assigned_to_id].empty?: + unless @issue.watched_by?(User.find(params[:issue][:assigned_to_id])): + @issue.add_watcher(User.find(params[:issue][:assigned_to_id])) + end + end end diff -r 4272e09f4b5f -r e47742d68d2d app/helpers/application_helper.rb --- a/app/helpers/application_helper.rb Thu Jan 20 10:01:33 2011 +0000 +++ b/app/helpers/application_helper.rb Mon Jan 24 14:03:13 2011 +0000 @@ -381,21 +381,28 @@ def page_header_title if @project.nil? || @project.new_record? - h(Setting.app_title) + a = [h(Setting.app_title), ''] + else + pname = [] b = [] ancestors = (@project.root? ? [] : @project.ancestors.visible) if ancestors.any? root = ancestors.shift b << link_to_project(root, {:jump => current_menu_item}, :class => 'root') if ancestors.size > 2 - b << '…' + b << '…' ancestors = ancestors[-2, 2] end b += ancestors.collect {|p| link_to_project(p, {:jump => current_menu_item}, :class => 'ancestor') } + b = b.join(' » ') + b << (' »') end - b << h(@project) - b.join(' » ') + + pname << h(@project) + + a = [pname, b] + end end diff -r 4272e09f4b5f -r e47742d68d2d app/models/issue.rb --- a/app/models/issue.rb Thu Jan 20 10:01:33 2011 +0000 +++ b/app/models/issue.rb Mon Jan 24 14:03:13 2011 +0000 @@ -90,7 +90,7 @@ after_save :reschedule_following_issues, :update_nested_set_attributes, :update_parent_attributes, :create_journal after_destroy :destroy_children after_destroy :update_parent_attributes - + # Returns true if usr or current user is allowed to view the issue def visible?(usr=nil) (usr || User.current).allowed_to?(:view_issues, self.project) diff -r 4272e09f4b5f -r e47742d68d2d app/views/issues/_attributes.rhtml --- a/app/views/issues/_attributes.rhtml Thu Jan 20 10:01:33 2011 +0000 +++ b/app/views/issues/_attributes.rhtml Mon Jan 24 14:03:13 2011 +0000 @@ -8,7 +8,7 @@ <% end %>

<%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), {:required => true}, :disabled => !@issue.leaf? %>

-

<%= f.select :assigned_to_id, (@issue.assignable_users.collect {|m| [m.name, m.id]}), :include_blank => true %>

+

<%= f.select :assigned_to_id, (@issue.assignable_users.collect {|m| [m.name, m.id]}), {:include_blank => true} %>

<% unless @project.issue_categories.empty? %>

<%= f.select :category_id, (@project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true %> <%= prompt_to_remote(image_tag('add.png', :style => 'vertical-align: middle;'), diff -r 4272e09f4b5f -r e47742d68d2d app/views/issues/_form.rhtml --- a/app/views/issues/_form.rhtml Thu Jan 20 10:01:33 2011 +0000 +++ b/app/views/issues/_form.rhtml Mon Jan 24 14:03:13 2011 +0000 @@ -35,7 +35,7 @@ <% if @issue.new_record? && User.current.allowed_to?(:add_issue_watchers, @project) -%>

<% @issue.project.users.sort.each do |user| -%> - + <% end -%>

<% end %> diff -r 4272e09f4b5f -r e47742d68d2d app/views/layouts/base.rhtml --- a/app/views/layouts/base.rhtml Thu Jan 20 10:01:33 2011 +0000 +++ b/app/views/layouts/base.rhtml Mon Jan 24 14:03:13 2011 +0000 @@ -32,17 +32,32 @@ <%= tag('div', {:id => 'header', :class => (display_main_menu?(@project) ? 'header-project' : 'header-general')}, true) %> -