diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/issues/index.rhtml | 55 | ||||
| -rw-r--r-- | app/views/my/blocks/_issuesassignedtome.rhtml | 4 | ||||
| -rw-r--r-- | app/views/my/blocks/_issuesreportedbyme.rhtml | 4 |
3 files changed, 59 insertions, 4 deletions
diff --git a/app/views/issues/index.rhtml b/app/views/issues/index.rhtml new file mode 100644 index 000000000..0f63ba96f --- /dev/null +++ b/app/views/issues/index.rhtml @@ -0,0 +1,55 @@ +<h2><%=l(:label_issue_plural)%></h2> + +<% form_tag({}, :id => 'query_form') do %> +<%= render :partial => 'queries/filters', :locals => {:query => @query} %> +<% end %> +<div class="contextual"> +<%= link_to_remote l(:button_apply), + { :url => { :set_filter => 1 }, + :update => "content", + :with => "Form.serialize('query_form')" + }, :class => 'icon icon-edit' %> + +<%= link_to_remote l(:button_clear), + { :url => { :set_filter => 1 }, + :update => "content", + }, :class => 'icon icon-reload' %> +</div> +<br /> + +<%= error_messages_for 'query' %> +<% if @query.valid? %> +<% if @issues.empty? %> +<p><i><%= l(:label_no_data) %></i></p> +<% else %> + +<table class="list"> + <thead><tr> + <%= sort_header_tag("#{Issue.table_name}.id", :caption => '#') %> + <%= sort_header_tag("#{Project.table_name}.name", :caption => l(:field_project)) %> + <%= sort_header_tag("#{Issue.table_name}.tracker_id", :caption => l(:field_tracker)) %> + <%= sort_header_tag("#{IssueStatus.table_name}.name", :caption => l(:field_status)) %> + <%= sort_header_tag("#{Issue.table_name}.priority_id", :caption => l(:field_priority)) %> + <th><%=l(:field_subject)%></th> + <%= sort_header_tag("#{User.table_name}.lastname", :caption => l(:field_assigned_to)) %> + <%= sort_header_tag("#{Issue.table_name}.updated_on", :caption => l(:field_updated_on)) %> + </tr></thead> + <tbody> + <% for issue in @issues %> + <tr class="<%= cycle("odd", "even") %>"> + <td align="center" valign="top"><%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %></td> + <td align="center" valign="top" nowrap><%=h issue.project.name %></td> + <td align="center" valign="top" nowrap><%= issue.tracker.name %></td> + <td valign="top"nowrap><div class="square" style="background:#<%= issue.status.html_color %>;"></div> <%= issue.status.name %></td> + <td align="center" valign="top"><%= issue.priority.name %></td> + <td><%= link_to h(issue.subject), :controller => 'issues', :action => 'show', :id => issue %></td> + <td align="center" valign="top" nowrap><%= issue.assigned_to.name if issue.assigned_to %></td> + <td align="center" valign="top" nowrap><%= format_time(issue.updated_on) %></td> + </tr> + <% end %> + </tbody> +</table> +<p><%= pagination_links_full @issue_pages %> +[ <%= @issue_pages.current.first_item %> - <%= @issue_pages.current.last_item %> / <%= @issue_count %> ]</p> +<% end %> +<% end %> diff --git a/app/views/my/blocks/_issuesassignedtome.rhtml b/app/views/my/blocks/_issuesassignedtome.rhtml index 0d49279f4..9b97cb39d 100644 --- a/app/views/my/blocks/_issuesassignedtome.rhtml +++ b/app/views/my/blocks/_issuesassignedtome.rhtml @@ -3,8 +3,8 @@ :conditions => ["assigned_to_id=? AND #{IssueStatus.table_name}.is_closed=? AND #{Project.table_name}.status=#{Project::STATUS_ACTIVE}", user.id, false], :limit => 10, :include => [ :status, :project, :tracker ], - :order => "#{Issue.table_name}.updated_on DESC") %> + :order => "#{Issue.table_name}.priority_id DESC, #{Issue.table_name}.updated_on DESC") %> <%= render :partial => 'issues/list_simple', :locals => { :issues => assigned_issues } %> <% if assigned_issues.length > 0 %> -<p><%=lwr(:label_last_updates, assigned_issues.length)%></p> +<p class="small"><%= link_to l(:label_issue_view_all), :controller => 'issues', :action => 'index', :set_filter => 1, :assigned_to_id => 'me' %></p> <% end %> diff --git a/app/views/my/blocks/_issuesreportedbyme.rhtml b/app/views/my/blocks/_issuesreportedbyme.rhtml index 250e8265d..a0770846c 100644 --- a/app/views/my/blocks/_issuesreportedbyme.rhtml +++ b/app/views/my/blocks/_issuesreportedbyme.rhtml @@ -6,5 +6,5 @@ :order => "#{Issue.table_name}.updated_on DESC") %> <%= render :partial => 'issues/list_simple', :locals => { :issues => reported_issues } %> <% if reported_issues.length > 0 %> -<p><%=lwr(:label_last_updates, reported_issues.length)%></p> -<% end %>
\ No newline at end of file +<p class="small"><%= link_to l(:label_issue_view_all), :controller => 'issues', :action => 'index', :set_filter => 1, :author_id => 'me' %></p> +<% end %> |