From: Toshi MARUYAMA Date: Thu, 1 Sep 2011 10:43:36 +0000 (+0000) Subject: rename .rhtml to .html.erb of app/views/my/blocks/_issuesassignedtome.rhtml. X-Git-Tag: 1.3.0~995 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b2219b3269d20af79615a0e699c6efcfbf9e8b24;p=redmine.git rename .rhtml to .html.erb of app/views/my/blocks/_issuesassignedtome.rhtml. :rhtml and :rxml were finally removed as template handlers at Rails 3.1 RC4. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6968 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/views/my/blocks/_issuesassignedtome.html.erb b/app/views/my/blocks/_issuesassignedtome.html.erb new file mode 100644 index 000000000..28267d69a --- /dev/null +++ b/app/views/my/blocks/_issuesassignedtome.html.erb @@ -0,0 +1,22 @@ +

<%=l(:label_assigned_to_me_issues)%> (<%= Issue.visible.open.count(:conditions => {:assigned_to_id => ([User.current.id] + User.current.group_ids)})%>)

+ +<% assigned_issues = Issue.visible.open.find(:all, + :conditions => {:assigned_to_id => ([User.current.id] + User.current.group_ids)}, + :limit => 10, + :include => [ :status, :project, :tracker, :priority ], + :order => "#{IssuePriority.table_name}.position DESC, #{Issue.table_name}.updated_on DESC") %> +<%= render :partial => 'issues/list_simple', :locals => { :issues => assigned_issues } %> +<% if assigned_issues.length > 0 %> +

<%= link_to l(:label_issue_view_all), :controller => 'issues', + :action => 'index', + :set_filter => 1, + :assigned_to_id => 'me', + :sort => 'priority:desc,updated_on:desc' %>

+<% end %> + +<% content_for :header_tags do %> +<%= auto_discovery_link_tag(:atom, + {:controller => 'issues', :action => 'index', :set_filter => 1, + :assigned_to_id => 'me', :format => 'atom', :key => User.current.rss_key}, + {:title => l(:label_assigned_to_me_issues)}) %> +<% end %> diff --git a/app/views/my/blocks/_issuesassignedtome.rhtml b/app/views/my/blocks/_issuesassignedtome.rhtml deleted file mode 100644 index 28267d69a..000000000 --- a/app/views/my/blocks/_issuesassignedtome.rhtml +++ /dev/null @@ -1,22 +0,0 @@ -

<%=l(:label_assigned_to_me_issues)%> (<%= Issue.visible.open.count(:conditions => {:assigned_to_id => ([User.current.id] + User.current.group_ids)})%>)

- -<% assigned_issues = Issue.visible.open.find(:all, - :conditions => {:assigned_to_id => ([User.current.id] + User.current.group_ids)}, - :limit => 10, - :include => [ :status, :project, :tracker, :priority ], - :order => "#{IssuePriority.table_name}.position DESC, #{Issue.table_name}.updated_on DESC") %> -<%= render :partial => 'issues/list_simple', :locals => { :issues => assigned_issues } %> -<% if assigned_issues.length > 0 %> -

<%= link_to l(:label_issue_view_all), :controller => 'issues', - :action => 'index', - :set_filter => 1, - :assigned_to_id => 'me', - :sort => 'priority:desc,updated_on:desc' %>

-<% end %> - -<% content_for :header_tags do %> -<%= auto_discovery_link_tag(:atom, - {:controller => 'issues', :action => 'index', :set_filter => 1, - :assigned_to_id => 'me', :format => 'atom', :key => User.current.rss_key}, - {:title => l(:label_assigned_to_me_issues)}) %> -<% end %>