jro_apps/redmine Commit - r2214:dea10c54f9f9

app/views/repositories/_link_to_functions.rhtml created 644 +10 0

@@ -0,0 +1,10
	1	<p>
	2	<% if @repository.supports_cat? %>
	3	<%= link_to_if action_name != 'entry', l(:button_view), {:action => 'entry', :id => @project, :path => to_path_param(@path), :rev => @rev } %> \|
	4	<% end %>
	5	<% if @repository.supports_annotate? %>
	6	<%= link_to_if action_name != 'annotate', l(:button_annotate), {:action => 'annotate', :id => @project, :path => to_path_param(@path), :rev => @rev } %> \|
	7	<% end %>
	8	<%= link_to(l(:button_download), {:action => 'entry', :id => @project, :path => to_path_param(@path), :rev => @rev, :format => 'raw' }) if @repository.supports_cat? %>
	9	<%= "(#{number_to_human_size(@entry.size)})" if @entry.size %>
	10	</p>

app/controllers/issues_controller.rb +4 -1

                   render :nothing => true, :layout => true
                   return
                 end
-                @issue.attributes = params[:issue]
+                if params[:issue].is_a?(Hash)
+                  @issue.attributes = params[:issue]
+                  @issue.watcher_user_ids = params[:issue]['watcher_user_ids'] if User.current.allowed_to?(:add_issue_watchers, @project)
+                end
                 @issue.author = User.current
                 default_status = IssueStatus.default

app/controllers/repositories_controller.rb +3 0

               end
               def annotate
+                @entry = @repository.entry(@path, @rev)
+                show_error_not_found and return unless @entry
                 @annotate = @repository.scm.annotate(@path, @rev)
                 render_error l(:error_scm_annotate) and return if @annotate.nil? || @annotate.empty?
               end

app/models/mailer.rb +1 0

                                 'Issue-Author' => issue.author.login
                 redmine_headers 'Issue-Assignee' => issue.assigned_to.login if issue.assigned_to
                 recipients issue.recipients
+                cc(issue.watcher_recipients - @recipients)
                 subject "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] (#{issue.status.name}) #{issue.subject}"
                 body :issue => issue,
                      :issue_url => url_for(:controller => 'issues', :action => 'show', :id => issue)

app/views/issues/_form.rhtml +8 0

             <p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
             <% end %>
+            <% if @issue.new_record? && User.current.allowed_to?(:add_issue_watchers, @project) -%>
+            <p><label><%= l(:label_issue_watchers) %></label>
+            <% @issue.project.users.sort.each do |user| -%>
+            <label class="floating"><%= check_box_tag 'issue[watcher_user_ids][]', user.id, @issue.watcher_user_ids.include?(user.id) %> <%=h user %></label>
+            <% end -%>
+            </p>
+            <% end %>
             <%= call_hook(:view_issues_form_details_bottom, { :issue => @issue, :form => f }) %>
             <%= wikitoolbar_for 'issue_description' %>

app/views/repositories/annotate.rhtml +2 0

             <h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
+            <p><%= render :partial => 'link_to_functions' %></p>
             <% colors = Hash.new {|k,v| k[v] = (k.size % 12) } %>
             <div class="autoscroll">

app/views/repositories/changes.rhtml +1 -10

@@ -1,15 +1,6
1	<h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => (@entry ? @entry.kind : nil), :revision => @rev } %></h2>	1	<h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => (@entry ? @entry.kind : nil), :revision => @rev } %></h2>
2		2
3	<p>	3	<p><%= render :partial => 'link_to_functions' %></p>
4	<% if @repository.supports_cat? %>
5	<%= link_to l(:button_view), {:action => 'entry', :id => @project, :path => to_path_param(@path), :rev => @rev } %> \|
6	<% end %>
7	<% if @repository.supports_annotate? %>
8	<%= link_to l(:button_annotate), {:action => 'annotate', :id => @project, :path => to_path_param(@path), :rev => @rev } %> \|
9	<% end %>
10	<%= link_to(l(:button_download), {:action => 'entry', :id => @project, :path => to_path_param(@path), :rev => @rev, :format => 'raw' }) if @repository.supports_cat? %>
11	<%= "(#{number_to_human_size(@entry.size)})" if @entry.size %>
12	</p>
13		4
14	<%= render_properties(@properties) %>	5	<%= render_properties(@properties) %>
15		6

app/views/repositories/entry.rhtml +2 0

             <h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
+            <p><%= render :partial => 'link_to_functions' %></p>
             <%= render :partial => 'common/file', :locals => {:filename => @path, :content => @content} %>
             <% content_for :header_tags do %>

doc/CHANGELOG +7 0

             http://www.redmine.org/
+            == v0.8.1
+            * Select watchers on new issue form
+            * Show view/annotate/download links on entry and annotate views
+            * Fixed: Deleted files are shown when using Darcs
             == 2008-12-30 v0.8.0
             * Setting added in order to limit the number of diff lines that should be displayed

lang/fr.yml +1 -1

             label_planning: Planning
             label_incoming_emails: Emails entrants
             label_generate_key: Générer une clé
-            label_issue_watchers: Utilisateurs surveillant cette demande
+            label_issue_watchers: Observateurs
             label_example: Exemple
             button_login: Connexion

lib/redmine/scm/adapters/darcs_adapter.rb +10 -3

                         end
                       end
                       return nil if $? && $?.exitstatus != 0
-                      entries.sort_by_name
+                      entries.compact.sort_by_name
                     end
                     def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
                     end
                     private
+                    # Returns an Entry from the given XML element
+                    # or nil if the entry was deleted
                     def entry_from_xml(element, path_prefix)
+                      modified_element = element.elements['modified']
+                      if modified_element.elements['modified_how'].text.match(/removed/)
+                        return nil
+                      end
                       Entry.new({:name => element.attributes['name'],
                                  :path => path_prefix + element.attributes['name'],
                                  :kind => element.name == 'file' ? 'file' : 'dir',
                                  :size => nil,
                                  :lastrev => Revision.new({
                                    :identifier => nil,
-                                   :scmid => element.elements['modified'].elements['patch'].attributes['hash']
+                                   :scmid => modified_element.elements['patch'].attributes['hash']
                                    })
                                  })
                     end

test/functional/issues_controller_test.rb +24 0

@@ -332,6 +332,30 class IssuesControllerTest < Test::Unit::TestCase
332	assert_equal 'activerecord_error_invalid', issue.errors.on(:custom_values)	332	assert_equal 'activerecord_error_invalid', issue.errors.on(:custom_values)
333	end	333	end
334		334
		335	def test_post_new_with_watchers
		336	@request.session[:user_id] = 2
		337	ActionMailer::Base.deliveries.clear
		338
		339	assert_difference 'Watcher.count', 2 do
		340	post :new, :project_id => 1,
		341	:issue => {:tracker_id => 1,
		342	:subject => 'This is a new issue with watchers',
		343	:description => 'This is the description',
		344	:priority_id => 5,
		345	:watcher_user_ids => ['2', '3']}
		346	end
		347	assert_redirected_to 'issues/show'
		348
		349	issue = Issue.find_by_subject('This is a new issue with watchers')
		350	# Watchers added
		351	assert_equal [2, 3], issue.watcher_user_ids.sort
		352	assert issue.watched_by?(User.find(3))
		353	# Watchers notified
		354	mail = ActionMailer::Base.deliveries.last
		355	assert_kind_of TMail::Mail, mail
		356	assert [mail.bcc, mail.cc].flatten.include?(User.find(3).mail)
		357	end
		358
335	def test_post_should_preserve_fields_values_on_validation_failure	359	def test_post_should_preserve_fields_values_on_validation_failure
336	@request.session[:user_id] = 2	360	@request.session[:user_id] = 2
337	post :new, :project_id => 1,	361	post :new, :project_id => 1,

test/unit/repository_darcs_test.rb +6 0

                   assert_equal 6, @repository.changesets.count
                 end
+                def test_deleted_files_should_not_be_listed
+                  entries = @repository.entries('sources')
+                  assert entries.detect {|e| e.name == 'watchers_controller.rb'}
+                  assert_nil entries.detect {|e| e.name == 'welcome_controller.rb'}
+                end
                 def test_cat
                   @repository.fetch_changesets
                   cat = @repository.cat("sources/welcome_controller.rb", 2)

vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb +2 0

                       class_eval do
                         has_many :watchers, :as => :watchable, :dependent => :delete_all
                         has_many :watcher_users, :through => :watchers, :source => :user
+                        attr_protected :watcher_ids, :watcher_user_ids
                       end
                     end
                   end

	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