jro_apps/redmine Commit - r9605:fcbb8acdb715

Merged r9786 from trunk....

Jean-Philippe Lang -

r9605:fcbb8acdb715

parent child

Context file:

r9605:fcbb8acdb715

Collapse all files

app/views/activities/index.html.erb +1 -1

-            <h2><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)) %></h2>
+            <h2><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %></h2>
             <p class="subtitle"><%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %></p>
             <div id="activity">
             <% @events_by_day.keys.sort.reverse.each do |day| %>
             <h3><%= format_activity_day(day) %></h3>
             <dl>
             <% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
               <dt class="<%= e.event_type %>  <%= User.current.logged? && e.respond_to?(:event_author) && User.current == e.event_author ? 'me' : nil %>">
               <%= avatar(e.event_author, :size => "24") if e.respond_to?(:event_author) %>
               <span class="time"><%= format_time(e.event_datetime, false) %></span>
               <%= content_tag('span', h(e.project), :class => 'project') if @project.nil? || @project != e.project %>
               <%= link_to format_activity_title(e.event_title), e.event_url %></dt>
               <dd><span class="description"><%= format_activity_description(e.event_description) %></span>
               <span class="author"><%= link_to_user(e.event_author) if e.respond_to?(:event_author) %></span></dd>
             <% end -%>
             </dl>
             <% end -%>
             </div>
             <%= content_tag('p', l(:label_no_data), :class => 'nodata') if @events_by_day.empty? %>
             <div style="float:left;">
             <%= link_to_content_update("\xc2\xab " + l(:label_previous),
                                params.merge(:from => @date_to - @days - 1),
                                :title => l(:label_date_from_to, :start => format_date(@date_to - 2*@days), :end => format_date(@date_to - @days - 1))) %>
             </div>
             <div style="float:right;">
             <%= link_to_content_update(l(:label_next) + " \xc2\xbb",
                                params.merge(:from => @date_to + @days - 1),
                                :title => l(:label_date_from_to, :start => format_date(@date_to), :end => format_date(@date_to + @days - 1))) unless @date_to >= Date.today %>
             </div>
             &nbsp;
             <% other_formats_links do |f| %>
               <%= f.link_to 'Atom', :url => params.merge(:from => nil, :key => User.current.rss_key) %>
             <% end %>
             <% content_for :header_tags do %>
             <%= auto_discovery_link_tag(:atom, params.merge(:format => 'atom', :from => nil, :key => User.current.rss_key)) %>
             <% end %>
             <% content_for :sidebar do %>
             <%= form_tag({}, :method => :get) do %>
             <h3><%= l(:label_activity) %></h3>
             <p><% @activity.event_types.each do |t| %>
             <%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %>
             <label for="show_<%=t%>"><%= link_to(l("label_#{t.singularize}_plural"), {"show_#{t}" => 1, :user_id => params[:user_id]})%></label>
             <br />
             <% end %></p>
             <% if @project && @project.descendants.active.any? %>
                 <%= hidden_field_tag 'with_subprojects', 0 %>
                 <p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p>
             <% end %>
             <%= hidden_field_tag('user_id', params[:user_id]) unless params[:user_id].blank? %>
             <p><%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %></p>
             <% end %>
             <% end %>
             <% html_title(l(:label_activity), @author) -%>

test/functional/activities_controller_test.rb +2 0

             require File.expand_path('../../test_helper', __FILE__)
             class ActivitiesControllerTest < ActionController::TestCase
               fixtures :projects, :trackers, :issue_statuses, :issues,
                        :enumerations, :users, :issue_categories,
                        :projects_trackers,
                        :roles,
                        :member_roles,
                        :members,
                        :groups_users,
                        :enabled_modules,
                        :workflows,
                        :journals, :journal_details
               def test_project_index
                 get :index, :id => 1, :with_subprojects => 0
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:events_by_day)
                 assert_tag :tag => "h3",
                            :content => /#{2.days.ago.to_date.day}/,
                            :sibling => { :tag => "dl",
                              :child => { :tag => "dt",
                                :attributes => { :class => /issue-edit/ },
                                :child => { :tag => "a",
                                  :content => /(#{IssueStatus.find(2).name})/,
                                }
                              }
                            }
               end
               def test_project_index_with_invalid_project_id_should_respond_404
                 get :index, :id => 299
                 assert_response 404
               end
               def test_previous_project_index
                 get :index, :id => 1, :from => 3.days.ago.to_date
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:events_by_day)
                 assert_tag :tag => "h3",
                            :content => /#{3.day.ago.to_date.day}/,
                            :sibling => { :tag => "dl",
                              :child => { :tag => "dt",
                                :attributes => { :class => /issue/ },
                                :child => { :tag => "a",
                                  :content => /#{Issue.find(1).subject}/,
                                }
                              }
                            }
               end
               def test_global_index
                 get :index
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:events_by_day)
                 assert_tag :tag => "h3",
                            :content => /#{5.day.ago.to_date.day}/,
                            :sibling => { :tag => "dl",
                              :child => { :tag => "dt",
                                :attributes => { :class => /issue/ },
                                :child => { :tag => "a",
                                  :content => /#{Issue.find(5).subject}/,
                                }
                              }
                            }
               end
               def test_user_index
                 get :index, :user_id => 2
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:events_by_day)
+                assert_select 'h2 a[href=/users/2]', :text => 'John Smith'
                 assert_tag :tag => "h3",
                            :content => /#{3.day.ago.to_date.day}/,
                            :sibling => { :tag => "dl",
                              :child => { :tag => "dt",
                                :attributes => { :class => /issue/ },
                                :child => { :tag => "a",
                                  :content => /#{Issue.find(1).subject}/,
                                }
                              }
                            }
               end
               def test_user_index_with_invalid_user_id_should_respond_404
                 get :index, :user_id => 299
                 assert_response 404
               end
               def test_index_atom_feed
                 get :index, :format => 'atom', :with_subprojects => 0
                 assert_response :success
                 assert_template 'common/feed'
                 assert_tag :tag => 'link', :parent =>  {:tag => 'feed', :parent => nil },
                     :attributes => {:rel => 'self', :href => 'http://test.host/activity.atom?with_subprojects=0'}
                 assert_tag :tag => 'link', :parent =>  {:tag => 'feed', :parent => nil },
                     :attributes => {:rel => 'alternate', :href => 'http://test.host/activity?with_subprojects=0'}
                 assert_tag :tag => 'entry', :child => {
                   :tag => 'link',
                   :attributes => {:href => 'http://test.host/issues/11'}}
               end
               def test_index_atom_feed_with_explicit_selection
                 get :index, :format => 'atom', :with_subprojects => 0,
                   :show_changesets => 1,
                   :show_documents => 1,
                   :show_files => 1,
                   :show_issues => 1,
                   :show_messages => 1,
                   :show_news => 1,
                   :show_time_entries => 1,
                   :show_wiki_edits => 1
                 assert_response :success
                 assert_template 'common/feed'
                 assert_tag :tag => 'link', :parent =>  {:tag => 'feed', :parent => nil },
                     :attributes => {:rel => 'self', :href => 'http://test.host/activity.atom?show_changesets=1&amp;show_documents=1&amp;show_files=1&amp;show_issues=1&amp;show_messages=1&amp;show_news=1&amp;show_time_entries=1&amp;show_wiki_edits=1&amp;with_subprojects=0'}
                 assert_tag :tag => 'link', :parent => {:tag => 'feed', :parent => nil },
                     :attributes => {:rel => 'alternate', :href => 'http://test.host/activity?show_changesets=1&amp;show_documents=1&amp;show_files=1&amp;show_issues=1&amp;show_messages=1&amp;show_news=1&amp;show_time_entries=1&amp;show_wiki_edits=1&amp;with_subprojects=0'}
                 assert_tag :tag => 'entry', :child => {
                   :tag => 'link',
                   :attributes => {:href => 'http://test.host/issues/11'}}
               end
               def test_index_atom_feed_with_one_item_type
                 get :index, :format => 'atom', :show_issues => '1'
                 assert_response :success
                 assert_template 'common/feed'
                 assert_tag :tag => 'title', :content => /Issues/
               end
             end

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