[Mezuro] Links on views fixed to new controllers

Diego Camarinha · Paulo Meireles
1 parent 335127bc
Showing 7 changed files with 21 additions and 50 deletions Show diff stats
plugins/mezuro/views/content_viewer/show_configuration.rhtml
plugins/mezuro/views/mezuro_plugin_base_tool/choose_base_tool.html.erb
plugins/mezuro/views/mezuro_plugin_base_tool/choose_metric.html.erb
plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound_metric_configuration.html.erb
plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_metric_configuration.html.erb
plugins/mezuro/views/mezuro_plugin_myprofile/choose_base_tool.html.erb
plugins/mezuro/views/mezuro_plugin_myprofile/choose_metric.html.erb
@@ -22,8 +22,10 @@
   <br/>
-  <%= link_to "#{image_tag ('/plugins/mezuro/images/plus.png')}Add Metric", :controller => "mezuro_plugin_base_tool",
-  :action => "choose_base_tool", :params => { :id => @configuration_content.id } %><br/>
+  <%= link_to "#{image_tag ('/plugins/mezuro/images/plus.png')}Add Metric", :controller => "mezuro_plugin_base_tool", 
+  																			:profile => @page.profile.identifier, 
+  																			:action => "choose_base_tool", 
+  																			:id => @configuration_content.id %><br/>
   <table>
     <tr class="titles">
@@ -40,19 +42,22 @@
             <%= metric_configuration.metric.origin %>
           </td>
           <td><%= metric_configuration.code %></td>
-          <td><%= link_to "Edit", :controller => "mezuro_plugin_metric_configuration", :action => "edit_metric_configuration", :params =>
-            {:metric_name => metric_configuration.metric.name, :id => @configuration_content.id} %></td>
+          <td><%= link_to "Edit", :controller => "mezuro_plugin_metric_configuration", :action => "edit_metric_configuration", 
+          						  :metric_name => metric_configuration.metric.name, :id => @configuration_content.id, 
+          						  :profile => @page.profile.identifier %></td>
         <% else %>
           <td>
             Compound Metric
           </td>
           <td><%= metric_configuration.code %></td>
-          <td><%= link_to "Edit", :controller => "mezuro_plugin_metric_configuration", :action => "edit_compound_metric_configuration", :params =>
-            {:metric_name => metric_configuration.metric.name, :id => @configuration_content.id} %></td>
+          <td><%= link_to "Edit", :controller => "mezuro_plugin_metric_configuration", 
+          						  :action => "edit_compound_metric_configuration", :metric_name => metric_configuration.metric.name, 
+          						  :id => @configuration_content.id, :profile => @page.profile.identifier %></td>
         <% end %>
-        <td><%= link_to "Remove", :controller => "mezuro_plugin_metric_configuration", :action => "remove_metric_configuration", :params =>
-          {:metric_name => metric_configuration.metric.name, :id => @configuration_content.id} %></td>
+        <td><%= link_to "Remove", :controller => "mezuro_plugin_metric_configuration", :action => "remove_metric_configuration", 
+        						  :metric_name => metric_configuration.metric.name, :id => @configuration_content.id, 
+        						  :profile => @page.profile.identifier %></td>
       </tr>
     <% end %>
   </table>
 <h2><%= @configuration_content.name%> Configuration</h2>
-<%= link_to "New Compound Metric", :controller => "mezuro_plugin_myprofile", :action => "new_compound_metric_configuration", :params =>
-{ :id => @configuration_content.id } %>
+<%= link_to "New Compound Metric", :controller => "mezuro_plugin_metric_configuration", :action => "new_compound_metric_configuration",
+								   :id => @configuration_content.id %>
 <h5>Base Tools:</h5>
 <table id="project_info">
   <% @base_tools.each do |base_tool| %>
     <tr>
       <td>
-        <%= link_to base_tool, :controller => "mezuro_plugin_base_tool", :action => "choose_metric", :params =>
-        { :base_tool => base_tool, :id => @configuration_content.id} %>
+        <%= link_to base_tool, :controller => "mezuro_plugin_base_tool", :action => "choose_metric", :base_tool => base_tool,
+        					   :id => @configuration_content.id %>
       </td>
     </tr>
   <% end %>
@@ -10,8 +10,8 @@
   <% @supported_metrics.each do |metric| %>
     <tr class="metric" title="<%= metric.name %>">
       <td>
-        <%= link_to metric.name, :controller => "mezuro_plugin_myprofile", :action => "new_metric_configuration", :params => {:metric_name => metric.name,
-        :base_tool => @base_tool, :id => @configuration_content.id } %>
+        <%= link_to metric.name, :controller => "mezuro_plugin_metric_configuration", :action => "new_metric_configuration",
+        						 :metric_name => metric.name, :base_tool => @base_tool, :id => @configuration_content.id %>
       </td>
     </tr>
   <% end %>
@@ -67,7 +67,7 @@
   </tr>
   <% if (@metric_configuration.ranges!=nil) 
     @metric_configuration.ranges.each do |range| %>
-      <%= render :partial => "range", :locals => {:range => range, :id => @configuration_content.id, 
+      <%= render :partial => "mezuro_plugin_range/range", :locals => {:range => range, :id => @configuration_content.id, 
           :metric_name => @metric_configuration.metric.name} %>
     <% end
   end %>
@@ -76,7 +76,7 @@
   </tr>
   <% if (@metric_configuration.ranges!=nil) 
     @metric_configuration.ranges.each do |range| %>
-      <%= render :partial => "range", :locals => {:range => range, :id => @configuration_content.id, 
+      <%= render :partial => "mezuro_plugin_range/range", :locals => {:range => range, :id => @configuration_content.id, 
           :metric_name => @metric.name} %>
     <% end
   end %>
@@ -1,16 +0,0 @@
-<h2><%= @configuration_content.name%> Configuration</h2>
-
-<%= link_to "New Compound Metric", :controller => "mezuro_plugin_myprofile", :action => "new_compound_metric_configuration", :params =>
-{ :id => @configuration_content.id } %>
-
-<h5>Base Tools:</h5>
-<table id="project_info">
-  <% @base_tools.each do |base_tool| %>
-    <tr>
-      <td>
-        <%= link_to base_tool, :controller => "mezuro_plugin_myprofile", :action => "choose_metric", :params =>
-        { :base_tool => base_tool, :id => @configuration_content.id} %>
-      </td>
-    </tr>
-  <% end %>
-</table>
@@ -1,18 +0,0 @@
-<h2><%= @configuration_content.name %> Configuration</h2>
-
-<table id="project_info">
-  <tr>
-    <h5>Metric Collector: <%= @base_tool %></h5>
-  </tr>
-  <tr>
-    <h5>Choose a metric to add:</h5>
-  </tr>
-  <% @supported_metrics.each do |metric| %>
-    <tr class="metric" title="<%= metric.name %>">
-      <td>
-        <%= link_to metric.name, :controller => "mezuro_plugin_myprofile", :action => "new_metric_configuration", :params => {:metric_name => metric.name,
-        :base_tool => @base_tool, :id => @configuration_content.id } %>
-      </td>
-    </tr>
-  <% end %>
-</table>
	@@ -67,7 +67,7 @@		@@ -67,7 +67,7 @@
67	</tr>	67	</tr>
68	<% if (@metric_configuration.ranges!=nil)	68	<% if (@metric_configuration.ranges!=nil)
69	@metric_configuration.ranges.each do \|range\| %>	69	@metric_configuration.ranges.each do \|range\| %>
70	- <%= render :partial => "range", :locals => {:range => range, :id => @configuration_content.id,	70	+ <%= render :partial => "mezuro_plugin_range/range", :locals => {:range => range, :id => @configuration_content.id,
71	:metric_name => @metric_configuration.metric.name} %>	71	:metric_name => @metric_configuration.metric.name} %>
72	<% end	72	<% end
73	end %>	73	end %>
	@@ -76,7 +76,7 @@		@@ -76,7 +76,7 @@
76	</tr>	76	</tr>
77	<% if (@metric_configuration.ranges!=nil)	77	<% if (@metric_configuration.ranges!=nil)
78	@metric_configuration.ranges.each do \|range\| %>	78	@metric_configuration.ranges.each do \|range\| %>
79	- <%= render :partial => "range", :locals => {:range => range, :id => @configuration_content.id,	79	+ <%= render :partial => "mezuro_plugin_range/range", :locals => {:range => range, :id => @configuration_content.id,
80	:metric_name => @metric.name} %>	80	:metric_name => @metric.name} %>
81	<% end	81	<% end
82	end %>	82	end %>
	@@ -1,16 +0,0 @@	@@ -1,16 +0,0 @@
1	-<h2><%= @configuration_content.name%> Configuration</h2>
2	-
3	-<%= link_to "New Compound Metric", :controller => "mezuro_plugin_myprofile", :action => "new_compound_metric_configuration", :params =>
4	-{ :id => @configuration_content.id } %>
5	-
6	-<h5>Base Tools:</h5>
7	-<table id="project_info">
8	- <% @base_tools.each do \|base_tool\| %>
9	- <tr>
10	- <td>
11	- <%= link_to base_tool, :controller => "mezuro_plugin_myprofile", :action => "choose_metric", :params =>
12	- { :base_tool => base_tool, :id => @configuration_content.id} %>
13	- </td>
14	- </tr>
15	- <% end %>
16	-</table>
	@@ -1,18 +0,0 @@	@@ -1,18 +0,0 @@
1	-<h2><%= @configuration_content.name %> Configuration</h2>
2	-
3	-<table id="project_info">
4	- <tr>
5	- <h5>Metric Collector: <%= @base_tool %></h5>
6	- </tr>
7	- <tr>
8	- <h5>Choose a metric to add:</h5>
9	- </tr>
10	- <% @supported_metrics.each do \|metric\| %>
11	- <tr class="metric" title="<%= metric.name %>">
12	- <td>
13	- <%= link_to metric.name, :controller => "mezuro_plugin_myprofile", :action => "new_metric_configuration", :params => {:metric_name => metric.name,
14	- :base_tool => @base_tool, :id => @configuration_content.id } %>
15	- </td>
16	- </tr>
17	- <% end %>
18	-</table>