summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2013-05-18 07:47:34 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2013-05-18 07:47:34 +0000
commit2c67e9e0d7ca021816c5926f2d77b0847a77e323 (patch)
tree1a36a7fa911031dc962936649741ac1c89402306 /app
parent6b03c741acfced92544d536e7682b1cb43746669 (diff)
downloadredmine-2c67e9e0d7ca021816c5926f2d77b0847a77e323.tar.gz
redmine-2c67e9e0d7ca021816c5926f2d77b0847a77e323.zip
Moved links to block titles on "My page".
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11860 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/views/my/blocks/_issuesassignedtome.html.erb13
-rw-r--r--app/views/my/blocks/_issuesreportedbyme.html.erb14
-rw-r--r--app/views/my/blocks/_issueswatched.html.erb15
3 files changed, 16 insertions, 26 deletions
diff --git a/app/views/my/blocks/_issuesassignedtome.html.erb b/app/views/my/blocks/_issuesassignedtome.html.erb
index 02d8c9aa6..41f87ec43 100644
--- a/app/views/my/blocks/_issuesassignedtome.html.erb
+++ b/app/views/my/blocks/_issuesassignedtome.html.erb
@@ -1,14 +1,11 @@
-<h3><%=l(:label_assigned_to_me_issues)%> (<%= Issue.visible.open.count(:conditions => {:assigned_to_id => ([User.current.id] + User.current.group_ids)})%>)</h3>
+<h3>
+ <%= link_to l(:label_assigned_to_me_issues),
+ issues_path(:set_filter => 1, :assigned_to_id => 'me', :sort => 'priority:desc,updated_on:desc') %>
+ (<%= Issue.visible.open.count(:conditions => {:assigned_to_id => ([User.current.id] + User.current.group_ids)})%>)
+</h3>
<% assigned_issues = issuesassignedtome_items %>
<%= render :partial => 'issues/list_simple', :locals => { :issues => assigned_issues } %>
-<% if assigned_issues.length > 0 %>
-<p class="small"><%= link_to l(:label_issue_view_all), :controller => 'issues',
- :action => 'index',
- :set_filter => 1,
- :assigned_to_id => 'me',
- :sort => 'priority:desc,updated_on:desc' %></p>
-<% end %>
<% content_for :header_tags do %>
<%= auto_discovery_link_tag(:atom,
diff --git a/app/views/my/blocks/_issuesreportedbyme.html.erb b/app/views/my/blocks/_issuesreportedbyme.html.erb
index 06bbda7f8..2253af9af 100644
--- a/app/views/my/blocks/_issuesreportedbyme.html.erb
+++ b/app/views/my/blocks/_issuesreportedbyme.html.erb
@@ -1,15 +1,11 @@
-<h3><%=l(:label_reported_issues)%> (<%= Issue.visible.count(:conditions => { :author_id => User.current.id }) %>)</h3>
+<h3>
+ <%= link_to l(:label_reported_issues),
+ issues_path(:set_filter => 1, :status_id => '*', :author_id => 'me', :sort => 'updated_on:desc') %>
+ (<%= Issue.visible.count(:conditions => { :author_id => User.current.id }) %>)
+</h3>
<% reported_issues = issuesreportedbyme_items %>
<%= render :partial => 'issues/list_simple', :locals => { :issues => reported_issues } %>
-<% if reported_issues.length > 0 %>
-<p class="small"><%= link_to l(:label_issue_view_all), :controller => 'issues',
- :action => 'index',
- :set_filter => 1,
- :status_id => '*',
- :author_id => 'me',
- :sort => 'updated_on:desc' %></p>
-<% end %>
<% content_for :header_tags do %>
<%= auto_discovery_link_tag(:atom,
diff --git a/app/views/my/blocks/_issueswatched.html.erb b/app/views/my/blocks/_issueswatched.html.erb
index 510920a08..6984526c9 100644
--- a/app/views/my/blocks/_issueswatched.html.erb
+++ b/app/views/my/blocks/_issueswatched.html.erb
@@ -1,11 +1,8 @@
-<h3><%=l(:label_watched_issues)%> (<%= Issue.visible.watched_by(user.id).count %>)</h3>
-<% watched_issues = issueswatched_items %>
+<h3>
+ <%= link_to l(:label_watched_issues),
+ issues_path(:set_filter => 1, :watcher_id => 'me', :sort => 'updated_on:desc') %>
+ (<%= Issue.visible.watched_by(user.id).count %>)
+</h3>
+<% watched_issues = issueswatched_items %>
<%= render :partial => 'issues/list_simple', :locals => { :issues => watched_issues } %>
-<% if watched_issues.length > 0 %>
-<p class="small"><%= link_to l(:label_issue_view_all), :controller => 'issues',
- :action => 'index',
- :set_filter => 1,
- :watcher_id => 'me',
- :sort => 'updated_on:desc' %></p>
-<% end %>