From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Thu, 1 Sep 2011 13:49:12 +0000 (+0000)
Subject: rename .rhtml to .html.erb of app/views/issues/_relations.rhtml.
X-Git-Tag: 1.3.0~957
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9e2106279e61abbc22e889808bb7cde8e4d31ae8;p=redmine.git

rename .rhtml to .html.erb of app/views/issues/_relations.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@7006 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/views/issues/_relations.html.erb b/app/views/issues/_relations.html.erb
new file mode 100644
index 000000000..4c114c485
--- /dev/null
+++ b/app/views/issues/_relations.html.erb
@@ -0,0 +1,37 @@
+<div class="contextual">
+<% if User.current.allowed_to?(:manage_issue_relations, @project) %>
+  <%= toggle_link l(:button_add), 'new-relation-form', {:focus => 'relation_issue_to_id'} %>
+<% end %>
+</div>
+
+<p><strong><%=l(:label_related_issues)%></strong></p>
+
+<% if @relations.present? %>
+<form>
+<table class="list issues">
+<% @relations.each do |relation| %>
+<tr class="issue hascontextmenu" id="relation-<%= relation.id %>">
+<td class="checkbox"><%= check_box_tag("ids[]", relation.other_issue(@issue).id, false, :id => nil) %></td>
+<td class="subject"><%= l(relation.label_for(@issue)) %> <%= "(#{l('datetime.distance_in_words.x_days', :count => relation.delay)})" if relation.delay && relation.delay != 0 %>
+    <%= h(relation.other_issue(@issue).project) + ' - ' if Setting.cross_project_issue_relations? %>
+    <%= link_to_issue(relation.other_issue(@issue), :truncate => 60) %>
+</td>
+<td class="status"><%=h relation.other_issue(@issue).status.name %></td>
+<td class="start_date"><%= format_date(relation.other_issue(@issue).start_date) %></td>
+<td class="due_date"><%= format_date(relation.other_issue(@issue).due_date) %></td>
+<td class="buttons"><%= link_to_remote(image_tag('link_break.png'), { :url => {:controller => 'issue_relations', :action => 'destroy', :id => relation},
+                                                  :method => :delete
+                                                }, :title => l(:label_relation_delete)) if authorize_for('issue_relations', 'destroy') %></td>
+</tr>
+<% end %>
+</table>
+</form>
+<% end %>
+
+<% remote_form_for(:relation, @relation,
+                 :url => {:controller => 'issue_relations', :action => 'create', :issue_id => @issue},
+                 :method => :post,
+                 :complete => "Form.Element.focus('relation_issue_to_id');",
+                 :html => {:id => 'new-relation-form', :style => (@relation ? '' : 'display: none;')}) do |f| %>
+<%= render :partial => 'issue_relations/form', :locals => {:f => f}%>
+<% end %>
diff --git a/app/views/issues/_relations.rhtml b/app/views/issues/_relations.rhtml
deleted file mode 100644
index 4c114c485..000000000
--- a/app/views/issues/_relations.rhtml
+++ /dev/null
@@ -1,37 +0,0 @@
-<div class="contextual">
-<% if User.current.allowed_to?(:manage_issue_relations, @project) %>
-  <%= toggle_link l(:button_add), 'new-relation-form', {:focus => 'relation_issue_to_id'} %>
-<% end %>
-</div>
-
-<p><strong><%=l(:label_related_issues)%></strong></p>
-
-<% if @relations.present? %>
-<form>
-<table class="list issues">
-<% @relations.each do |relation| %>
-<tr class="issue hascontextmenu" id="relation-<%= relation.id %>">
-<td class="checkbox"><%= check_box_tag("ids[]", relation.other_issue(@issue).id, false, :id => nil) %></td>
-<td class="subject"><%= l(relation.label_for(@issue)) %> <%= "(#{l('datetime.distance_in_words.x_days', :count => relation.delay)})" if relation.delay && relation.delay != 0 %>
-    <%= h(relation.other_issue(@issue).project) + ' - ' if Setting.cross_project_issue_relations? %>
-    <%= link_to_issue(relation.other_issue(@issue), :truncate => 60) %>
-</td>
-<td class="status"><%=h relation.other_issue(@issue).status.name %></td>
-<td class="start_date"><%= format_date(relation.other_issue(@issue).start_date) %></td>
-<td class="due_date"><%= format_date(relation.other_issue(@issue).due_date) %></td>
-<td class="buttons"><%= link_to_remote(image_tag('link_break.png'), { :url => {:controller => 'issue_relations', :action => 'destroy', :id => relation},
-                                                  :method => :delete
-                                                }, :title => l(:label_relation_delete)) if authorize_for('issue_relations', 'destroy') %></td>
-</tr>
-<% end %>
-</table>
-</form>
-<% end %>
-
-<% remote_form_for(:relation, @relation,
-                 :url => {:controller => 'issue_relations', :action => 'create', :issue_id => @issue},
-                 :method => :post,
-                 :complete => "Form.Element.focus('relation_issue_to_id');",
-                 :html => {:id => 'new-relation-form', :style => (@relation ? '' : 'display: none;')}) do |f| %>
-<%= render :partial => 'issue_relations/form', :locals => {:f => f}%>
-<% end %>