jro_apps/redmine Commit - r1546:062a2d6f5d6e

Adds atom feed on time entries details (#1479)....

Jean-Philippe Lang -

r1546:062a2d6f5d6e

parent child

Context file:

r1546:062a2d6f5d6e

app/controllers/timelog_controller.rb +8 0

                       render :layout => !request.xhr?
                     }
+                    format.atom {
+                      entries = TimeEntry.find(:all,
+                                               :include => [:project, :activity, :user, {:issue => :tracker}],
+                                               :conditions => cond.conditions,
+                                               :order => "#{TimeEntry.table_name}.created_on DESC",
+                                               :limit => Setting.feeds_limit.to_i)
+                      render_feed(entries, :title => l(:label_spent_time))
+                    }
                     format.csv {
                       # Export all entries
                       @entries = TimeEntry.find(:all,

app/models/time_entry.rb +5 0

               belongs_to :activity, :class_name => 'Enumeration', :foreign_key => :activity_id
               attr_protected :project_id, :user_id, :tyear, :tmonth, :tweek
+              acts_as_event :title => Proc.new {|o| "#{o.user}: #{lwr(:label_f_hour, o.hours)} (#{(o.issue || o.project).event_title})"},
+                            :url => Proc.new {|o| {:controller => 'timelog', :action => 'details', :project_id => o.project}},
+                            :author => :user,
+                            :description => :comments
               validates_presence_of :user_id, :activity_id, :project_id, :hours, :spent_on
               validates_numericality_of :hours, :allow_nil => true

app/views/timelog/details.rhtml +5 0

             <p class="other-formats">
             <%= l(:label_export_to) %>
+            <span><%= link_to 'Atom', {:issue_id => @issue, :format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
             <span><%= link_to 'CSV', params.merge(:format => 'csv'), :class => 'csv' %></span>
             </p>
             <% end %>
             <% html_title l(:label_spent_time), l(:label_details) %>
+            <% content_for :header_tags do %>
+                <%= auto_discovery_link_tag(:atom, {:issue_id => @issue, :format => 'atom', :key => User.current.rss_key}, :title => l(:label_spent_time)) %>
+            <% end %>

test/functional/timelog_controller_test.rb +8 0

                 assert_equal '2007-04-22'.to_date, assigns(:to)
               end
+              def test_details_atom_feed
+                get :details, :project_id => 1, :format => 'atom'
+                assert_response :success
+                assert_equal 'application/atom+xml', @response.content_type
+                assert_not_nil assigns(:items)
+                assert assigns(:items).first.is_a?(TimeEntry)
+              end
               def test_details_csv_export
                 get :details, :project_id => 1, :format => 'csv'
                 assert_response :success

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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