Browse files

refactored view overloads to proper patches as view overloads are a B…

…AD idea...
  • Loading branch information...
1 parent a3bf6a1 commit c00a056b9594387f4ddc456bbc84a3b0bf46eac0 @yeah yeah committed Jul 31, 2011
Showing with 37 additions and 206 deletions.
  1. +8 −1 README.rdoc
  2. +0 −63 app/views/issues/show.api.rsb
  3. +0 −142 app/views/issues/show.rhtml
  4. +13 −0 extra/issues_show.api.rsb.patch
  5. +16 −0 extra/issues_show.rhtml.patch
View
9 README.rdoc
@@ -16,8 +16,15 @@ A plugin that records the date when the issue is closed and shows it on the issu
= Version 0.0.3 (by Jan Schulz-Hofen, Planio GmbH)
- Added namespaces to patches and hooks
+ - Refactored view overloads to proper patches
= Get the Stable Version
- Clone the project
- run git tag to see a list of available versions
- - run git checkout v0.0.x, to the version choosed
+ - run git checkout v0.0.x, to the preferred version
+
+= Installation
+ - Install the plugin
+ - Migrate
+ - Patch app/views/issues/show.rhtml using the patch file in extra/
+ - Patch app/views/issues/show.api.rsb using the patch file in extra/
View
63 app/views/issues/show.api.rsb
@@ -1,63 +0,0 @@
-api.issue do
- api.id @issue.id
- api.project(:id => @issue.project_id, :name => @issue.project.name) unless @issue.project.nil?
- api.tracker(:id => @issue.tracker_id, :name => @issue.tracker.name) unless @issue.tracker.nil?
- api.status(:id => @issue.status_id, :name => @issue.status.name) unless @issue.status.nil?
- api.priority(:id => @issue.priority_id, :name => @issue.priority.name) unless @issue.priority.nil?
- api.author(:id => @issue.author_id, :name => @issue.author.name) unless @issue.author.nil?
- api.assigned_to(:id => @issue.assigned_to_id, :name => @issue.assigned_to.name) unless @issue.assigned_to.nil?
- api.category(:id => @issue.category_id, :name => @issue.category.name) unless @issue.category.nil?
- api.fixed_version(:id => @issue.fixed_version_id, :name => @issue.fixed_version.name) unless @issue.fixed_version.nil?
- api.parent(:id => @issue.parent_id) unless @issue.parent.nil?
-
- api.subject @issue.subject
- api.description @issue.description
- api.start_date @issue.start_date
- api.due_date @issue.due_date
- api.done_ratio @issue.done_ratio
- api.estimated_hours @issue.estimated_hours
- api.spent_hours(@issue.spent_hours) if User.current.allowed_to?(:view_time_entries, @project)
-
- render_api_custom_values @issue.custom_field_values, api
-
- api.closed_date @issue.closed_date
-
- api.created_on @issue.created_on
- api.updated_on @issue.updated_on
-
- render_api_issue_children(@issue, api) if include_in_api_response?('children')
-
- api.array :relations do
- @relations.each do |relation|
- api.relation(:id => relation.id, :issue_id => relation.other_issue(@issue).id, :relation_type => relation.relation_type_for(@issue), :delay => relation.delay)
- end
- end if include_in_api_response?('relations') && @relations.present?
-
- api.array :changesets do
- @issue.changesets.each do |changeset|
- api.changeset :revision => changeset.revision do
- api.user(:id => changeset.user_id, :name => changeset.user.name) unless changeset.user.nil?
- api.comments changeset.comments
- api.committed_on changeset.committed_on
- end
- end
- end if include_in_api_response?('changesets') && User.current.allowed_to?(:view_changesets, @project)
-
- api.array :journals do
- @issue.journals.each do |journal|
- api.journal :id => journal.id do
- api.user(:id => journal.user_id, :name => journal.user.name) unless journal.user.nil?
- api.notes journal.notes
- api.created_on journal.created_on
- api.array :details do
- journal.details.each do |detail|
- api.detail :property => detail.property, :name => detail.prop_key do
- api.old_value detail.old_value
- api.new_value detail.value
- end
- end
- end
- end
- end
- end if include_in_api_response?('journals')
-end
View
142 app/views/issues/show.rhtml
@@ -1,142 +0,0 @@
-<%= render :partial => 'action_menu' %>
-
-<h2><%= @issue.tracker.name %> #<%= @issue.id %></h2>
-
-<div class="<%= @issue.css_classes %> details">
- <%= avatar(@issue.author, :size => "50") %>
-
-<div class="subject">
-<%= render_issue_subject_with_tree(@issue) %>
-</div>
- <p class="author">
- <%= authoring @issue.created_on, @issue.author %>.
- <% if @issue.created_on != @issue.updated_on %>
- <%= l(:label_updated_time, time_tag(@issue.updated_on)) %>.
- <% end %>
- </p>
-
-<table class="attributes">
-<tr>
- <th class="status"><%=l(:field_status)%>:</th><td class="status"><%= @issue.status.name %></td>
- <% if @issue.closed_date %>
- <th class="start-date"><%=l(:field_start_end_date)%>:</th><td class="start-date"><%= format_date(@issue.start_date) %> - <%= format_date(@issue.closed_date) %></td>
- <% else %>
- <th class="start-date"><%=l(:field_start_date)%>:</th><td class="start-date"><%= format_date(@issue.start_date) %></td>
- <% end %>
-</tr>
-<tr>
- <th class="priority"><%=l(:field_priority)%>:</th><td class="priority"><%= @issue.priority.name %></td>
- <th class="due-date"><%=l(:field_due_date)%>:</th><td class="due-date"><%= format_date(@issue.due_date) %></td>
-</tr>
-<tr>
- <th class="assigned-to"><%=l(:field_assigned_to)%>:</th><td class="assigned-to"><%= avatar(@issue.assigned_to, :size => "14") %><%= @issue.assigned_to ? link_to_user(@issue.assigned_to) : "-" %></td>
- <th class="progress"><%=l(:field_done_ratio)%>:</th><td class="progress"><%= progress_bar @issue.done_ratio, :width => '80px', :legend => "#{@issue.done_ratio}%" %></td>
-</tr>
-<tr>
- <th class="category"><%=l(:field_category)%>:</th><td class="category"><%=h @issue.category ? @issue.category.name : "-" %></td>
- <% if User.current.allowed_to?(:view_time_entries, @project) %>
- <th class="spent-time"><%=l(:label_spent_time)%>:</th>
- <td class="spent-time"><%= @issue.spent_hours > 0 ? (link_to l_hours(@issue.spent_hours), {:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue}) : "-" %></td>
- <% end %>
-</tr>
-<tr>
- <th class="fixed-version"><%=l(:field_fixed_version)%>:</th><td class="fixed-version"><%= @issue.fixed_version ? link_to_version(@issue.fixed_version) : "-" %></td>
- <% if @issue.estimated_hours %>
- <th class="estimated-hours"><%=l(:field_estimated_hours)%>:</th><td class="estimated-hours"><%= l_hours(@issue.estimated_hours) %></td>
- <% end %>
-</tr>
-
-<%= render_custom_fields_rows(@issue) %>
-<%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
-</table>
-
-<% if @issue.description? || @issue.attachments.any? -%>
-<hr />
-<% if @issue.description? %>
- <div class="contextual">
- <%= link_to_remote_if_authorized(l(:button_quote), { :url => {:controller => 'journals', :action => 'new', :id => @issue} }, :class => 'icon icon-comment') %>
- </div>
-
- <p><strong><%=l(:field_description)%></strong></p>
- <div class="wiki">
- <%= textilizable @issue, :description, :attachments => @issue.attachments %>
- </div>
-<% end %>
-<%= link_to_attachments @issue %>
-<% end -%>
-
-<%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
-
-<% if !@issue.leaf? || User.current.allowed_to?(:manage_subtasks, @project) %>
-<hr />
-<div id="issue_tree">
-<div class="contextual">
- <%= link_to(l(:button_add), {:controller => 'issues', :action => 'new', :project_id => @project, :issue => {:parent_issue_id => @issue}}) if User.current.allowed_to?(:manage_subtasks, @project) %>
-</div>
-<p><strong><%=l(:label_subtask_plural)%></strong></p>
-<%= render_descendants_tree(@issue) unless @issue.leaf? %>
-</div>
-<% end %>
-
-<% if authorize_for('issue_relations', 'new') || @issue.relations.present? %>
-<hr />
-<div id="relations">
-<%= render :partial => 'relations' %>
-</div>
-<% end %>
-
-</div>
-
-<% if @changesets.present? %>
-<div id="issue-changesets">
-<h3><%=l(:label_associated_revisions)%></h3>
-<%= render :partial => 'changesets', :locals => { :changesets => @changesets} %>
-</div>
-<% end %>
-
-<% if @journals.present? %>
-<div id="history">
-<h3><%=l(:label_history)%></h3>
-<%= render :partial => 'history', :locals => { :issue => @issue, :journals => @journals } %>
-</div>
-<% end %>
-
-
-<div style="clear: both;"></div>
-<%= render :partial => 'action_menu', :locals => {:replace_watcher => 'watcher2' } %>
-
-<div style="clear: both;"></div>
-<% if authorize_for('issues', 'edit') %>
- <div id="update" style="display:none;">
- <h3><%= l(:button_update) %></h3>
- <%= render :partial => 'edit' %>
- </div>
-<% end %>
-
-<% other_formats_links do |f| %>
- <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
- <%= f.link_to 'PDF' %>
-<% end %>
-
-<% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
-
-<% content_for :sidebar do %>
- <%= render :partial => 'issues/sidebar' %>
-
- <% if User.current.allowed_to?(:add_issue_watchers, @project) ||
- (@issue.watchers.present? && User.current.allowed_to?(:view_issue_watchers, @project)) %>
- <div id="watchers">
- <%= render :partial => 'watchers/watchers', :locals => {:watched => @issue} %>
- </div>
- <% end %>
-<% end %>
-
-<% content_for :header_tags do %>
- <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@issue.project} - #{@issue.tracker} ##{@issue.id}: #{@issue.subject}") %>
- <%= stylesheet_link_tag 'scm' %>
- <%= javascript_include_tag 'context_menu' %>
- <%= stylesheet_link_tag 'context_menu' %>
- <%= stylesheet_link_tag 'context_menu_rtl' if l(:direction) == 'rtl' %>
-<% end %>
-<div id="context-menu" style="display: none;"></div>
-<%= javascript_tag "new ContextMenu('#{issues_context_menu_path}')" %>
View
13 extra/issues_show.api.rsb.patch
@@ -0,0 +1,13 @@
+diff --git a/app/views/issues/show.api.rsb b/app/views/issues/show.api.rsb
+index 170aeb3..607f71d 100644
+--- a/app/views/issues/show.api.rsb
++++ b/app/views/issues/show.api.rsb
+@@ -19,6 +19,8 @@ api.issue do
+ api.spent_hours(@issue.spent_hours) if User.current.allowed_to?(:view_time_entries, @project)
+
+ render_api_custom_values @issue.custom_field_values, api
++
++ api.closed_date @issue.closed_date
+
+ api.created_on @issue.created_on
+ api.updated_on @issue.updated_on
View
16 extra/issues_show.rhtml.patch
@@ -0,0 +1,16 @@
+diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
+index 619ef79..235881f 100644
+--- a/app/views/issues/show.rhtml
++++ b/app/views/issues/show.rhtml
+@@ -35,7 +35,11 @@
+ <table class="attributes">
+ <tr>
+ <th class="status"><%=l(:field_status)%>:</th><td class="status"><%= h(@issue.status.name) %></td>
++ <% if @issue.closed_date %>
++ <th class="start-date"><%=l(:field_start_end_date)%>:</th><td class="start-date"><%= format_date(@issue.start_date) %> - <%= format_date(@issue.closed_date) %></td>
++ <% else %>
+ <th class="start-date"><%=l(:field_start_date)%>:</th><td class="start-date"><%= format_date(@issue.start_date) %></td>
++ <% end %>
+ </tr>
+ <tr>
+ <th class="priority"><%=l(:field_priority)%>:</th><td class="priority"><%= h(@issue.priority.name) %></td>

0 comments on commit c00a056

Please sign in to comment.