[Mezuro] Refactored links in views.

João M. M. da Silva + Diego Araújo · Paulo Meireles
1 parent 7f3a7e5e
Showing 14 changed files with 35 additions and 76 deletions Show diff stats
plugins/mezuro/controllers/myprofile/mezuro_plugin_reading_controller.rb
plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb
plugins/mezuro/test/functional/myprofile/mezuro_plugin_reading_controller_test.rb
plugins/mezuro/test/functional/profile/mezuro_plugin_repository_controller_test.rb
plugins/mezuro/views/mezuro_plugin_metric_configuration/choose_metric.html.erb
plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound.html.erb
plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_native.html.erb
plugins/mezuro/views/mezuro_plugin_metric_configuration/new_compound.html.erb
plugins/mezuro/views/mezuro_plugin_metric_configuration/new_native.html.erb
plugins/mezuro/views/mezuro_plugin_reading/edit.html.erb
plugins/mezuro/views/mezuro_plugin_reading/new.html.erb
plugins/mezuro/views/mezuro_plugin_repository/edit.html.erb
plugins/mezuro/views/mezuro_plugin_repository/new.html.erb
plugins/mezuro/views/mezuro_plugin_repository/show.html.erb
@@ -3,10 +3,7 @@ class MezuroPluginReadingController &lt; MezuroPluginMyprofileController
   append_view_path File.join(File.dirname(__FILE__) + '/../../views')
   def new
-    reading_group_content = profile.articles.find(params[:id])
-    @reading_group_name = reading_group_content.name
-    @data_profile = reading_group_content.profile.identifier
-    @reading_group_content_id = reading_group_content.id
+    @reading_group_content = profile.articles.find(params[:id])
   end
   def create
@@ -21,11 +18,7 @@ class MezuroPluginReadingController &lt; MezuroPluginMyprofileController
   end
   def edit
-    reading_group_content = profile.articles.find(params[:id])
-    @reading_group_name = reading_group_content.name
-    @data_profile = reading_group_content.profile.identifier
-    @reading_group_content_id = reading_group_content.id
-
+    @reading_group_content = profile.articles.find(params[:id])
     @reading = Kalibro::Reading.find params[:reading_id]
   end
@@ -3,10 +3,7 @@ class MezuroPluginRepositoryController &lt; MezuroPluginProfileController
   append_view_path File.join(File.dirname(__FILE__) + '/../../views')
   def new
-    project_content = profile.articles.find(params[:id])
-    @project_name = project_content.name
-    @data_profile = project_content.profile.identifier
-    @project_content_id = project_content.id
+    @project_content = profile.articles.find(params[:id])
     @repository_types = Kalibro::Repository.repository_types
@@ -32,11 +29,7 @@ class MezuroPluginRepositoryController &lt; MezuroPluginProfileController
   end
   def edit
-    project_content = profile.articles.find(params[:id])
-    @project_name = project_content.name
-    @data_profile = project_content.profile.identifier
-    @project_content_id = project_content.id
-
+    @project_content = profile.articles.find(params[:id])
     @repository_types = Kalibro::Repository.repository_types
     configurations = Kalibro::Configuration.all
@@ -45,7 +38,7 @@ class MezuroPluginRepositoryController &lt; MezuroPluginProfileController
       [configuration.name,configuration.id] 
     end
-    @repository = project_content.repositories.select{ |repository| repository.id.to_s == params[:repository_id] }.first
+    @repository = @project_content.repositories.select{ |repository| repository.id.to_s == params[:repository_id] }.first
   end
   def update
@@ -63,12 +56,9 @@ class MezuroPluginRepositoryController &lt; MezuroPluginProfileController
   end
   def show 
-    project_content = profile.articles.find(params[:id])
-    @project_name = project_content.name
-    @repository = project_content.repositories.select{ |repository| repository.id.to_s == params[:repository_id] }.first
+    @project_content = profile.articles.find(params[:id])
+    @repository = @project_content.repositories.select{ |repository| repository.id.to_s == params[:repository_id] }.first
     @configuration_name = Kalibro::Configuration.configuration_of(@repository.id).name
-    @data_profile = project_content.profile.identifier
-    @data_content = project_content.id
   end
   def destroy
@@ -22,10 +22,8 @@ class MezuroPluginReadingControllerTest &lt; ActionController::TestCase
   should 'set variables to create a new reading' do
     get :new, :profile => @profile.identifier, :id => @content.id
-
-    assert_equal @content.id, assigns(:reading_group_content_id)
-    assert_equal @content.name, assigns(:reading_group_name)
-    assert_equal @content.profile.identifier, assigns(:data_profile)
+    assert_equal @content.id, assigns(:reading_group_content).id
+    assert_response :success
   end
   should 'create a reading' do
@@ -47,13 +45,10 @@ class MezuroPluginReadingControllerTest &lt; ActionController::TestCase
   should 'set variables to edit a reading' do
     Kalibro::Reading.expects(:find).with(@reading.id.to_s).returns(@reading)
-
     get :edit, :profile => @profile.identifier, :id => @content.id, :reading_id => @reading.id
-
-    assert_equal @content.id, assigns(:reading_group_content_id)
-    assert_equal @content.name, assigns(:reading_group_name)
-    assert_equal @content.profile.identifier, assigns(:data_profile)
+    assert_equal @content.id, assigns(:reading_group_content).id
     assert_equal @reading, assigns(:reading)
+    assert_response :success
   end
   should 'update a reading' do
@@ -31,12 +31,11 @@ class MezuroPluginRepositoryControllerTest &lt; ActionController::TestCase
     get :new, :profile => @profile.identifier, :id => @content.id
-    assert_equal @content.id, assigns(:project_content_id)
-    assert_equal @content.name, assigns(:project_name)
+    assert_equal @content.id, assigns(:project_content).id
     assert_equal @repository_types, assigns(:repository_types)
-    assert_equal @content.profile.identifier, assigns(:data_profile)
     assert_equal @all_configurations.first.name, assigns(:configuration_select).first.first
     assert_equal @all_configurations.first.id, assigns(:configuration_select).first.last
+    assert_response :success
   end
   should 'create a repository' do
@@ -58,20 +57,18 @@ class MezuroPluginRepositoryControllerTest &lt; ActionController::TestCase
   end
   should 'set variables to edit a repository' do
-    articles = mock
     Kalibro::Repository.expects(:repository_types).returns(@repository_types)
     Kalibro::Configuration.expects(:all).returns(@all_configurations)
     Kalibro::Repository.expects(:repositories_of).with(@content.project_id).returns([@repository])
     get :edit, :profile => @profile.identifier, :id => @content.id, :repository_id => @repository.id
-    assert_equal @content.id, assigns(:project_content_id)
-    assert_equal @content.name, assigns(:project_name)
+    assert_equal @content.id, assigns(:project_content).id
     assert_equal @repository_types, assigns(:repository_types)
-    assert_equal @content.profile.identifier, assigns(:data_profile)
     assert_equal @all_configurations.first.name, assigns(:configuration_select).first.first
     assert_equal @all_configurations.first.id, assigns(:configuration_select).first.last
     assert_equal @repository, assigns(:repository)
+    assert_response :success
   end
   should 'update a repository' do
@@ -98,11 +95,9 @@ class MezuroPluginRepositoryControllerTest &lt; ActionController::TestCase
     get :show, :profile => @profile.identifier, :id => @content.id, :repository_id => @repository.id
-    assert_equal @content.name, assigns(:project_name)
+    assert_equal @content.id, assigns(:project_content).id
     assert_equal @repository, assigns(:repository)
     assert_equal @configuration.name, assigns(:configuration_name)
-    assert_equal @content.profile.identifier, assigns(:data_profile)
-    assert_equal @content.id, assigns(:data_content)
     assert_response :success
   end
-<h2><%= @configuration_content.name%> Configuration</h2>
+<h2><%= link_to("#{@configuration_content.name} Configuration", @configuration_content.view_url) %></h2>
 <%= link_to "New Compound Metric", :controller => "mezuro_plugin_metric_configuration", :action => "new_compound",
 								   :id => @configuration_content.id %>
@@ -2,7 +2,7 @@
 <script src="/javascripts/colorpicker.js" type="text/javascript"></script>
 <script src="/javascripts/colorpicker-noosfero.js" type="text/javascript"></script>
-<h2><%= @configuration_content.name %> Configuration</h2>
+<h2><%= link_to("#{@configuration_content.name} Configuration", @configuration_content.view_url) %></h2>
 <% owner = (not user.nil?) && user.id == @profile.id %>
@@ -2,7 +2,7 @@
 <script src="/javascripts/colorpicker.js" type="text/javascript"></script>
 <script src="/javascripts/colorpicker-noosfero.js" type="text/javascript"></script>
-<h2><%= @configuration_content.name %> Configuration</h2>
+<h2><%= link_to("#{@configuration_content.name} Configuration", @configuration_content.view_url) %></h2>
 <% owner = (not user.nil?) && user.id == @profile.id %>
-<h2><%= @configuration_content.name %> Configuration</h2>
+<h2><%= link_to("#{@configuration_content.name} Configuration", @configuration_content.view_url) %></h2>
 <% form_for :metric_configuration, :url => {:action =>"create_compound", :controller => "mezuro_plugin_metric_configuration"}, :method => :get do |f| %>
   <%= hidden_field_tag :id, @configuration_content.id %>
 <script src="/plugins/mezuro/javascripts/validations.js" type="text/javascript"></script>
-<h2><%= @configuration_content.name %> Configuration</h2>
+<h2><%= link_to("#{@configuration_content.name} Configuration", @configuration_content.view_url) %></h2>
 <!-- TODO This form should be a partial similar to _native_metric_configuration_form.rhtml -->
 <% form_for :metric_configuration, :url => {:action =>"create_native", :controller => "mezuro_plugin_metric_configuration"},  :method => :get do |f| %>
 <script src="/javascripts/colorpicker.js" type="text/javascript"></script>
 <script src="/javascripts/colorpicker-noosfero.js" type="text/javascript"></script>
-<h3> <%= link_to( @reading_group_name, homepage_url(@data_profile, @reading_group_name.downcase.gsub(/[^0-9A-Za-z\-]/, '-')) ) %></h3>
+<h2><%= link_to("#{@reading_group_content.name} Reading Group", @reading_group_content.view_url) %></h2>
 <% form_for :reading, :url => {:action =>"update", :controller => "mezuro_plugin_reading"},  :method => :get do |f| %>
-  <%= hidden_field_tag :id, @reading_group_content_id %>
+  <%= hidden_field_tag :id, @reading_group_content.id %>
   <%= f.hidden_field :id %>
   <%= required labelled_form_field _('label:'), f.text_field(:label) %> 
 <script src="/javascripts/colorpicker.js" type="text/javascript"></script>
 <script src="/javascripts/colorpicker-noosfero.js" type="text/javascript"></script>
-<h3> <%= link_to( @reading_group_name, homepage_url(@data_profile, @reading_group_name.downcase.gsub(/[^0-9A-Za-z\-]/, '-')) ) %></h3>
+<h2><%= link_to("#{@reading_group_content.name} Reading Group", @reading_group_content.view_url) %></h2>
 <% form_for :reading, :url => {:action =>"create", :controller => "mezuro_plugin_reading"},  :method => :get do |f| %>
-  <%= hidden_field_tag :id, @reading_group_content_id %>
+  <%= hidden_field_tag :id, @reading_group_content.id %>
   <%= required labelled_form_field _('label:'), f.text_field(:label) %> 
-<h3> <%= link_to( @project_name, homepage_url(@data_profile, @project_name.downcase.gsub(/[^0-9A-Za-z]/, '')) ) %></h3>
+<h2><%= link_to("#{@project_content.name} Project", @project_content.view_url) %></h2>
 <% form_for :repository, :url => {:action =>"update", :controller => "mezuro_plugin_repository"},  :method => :get do |f| %>
-  <%= hidden_field_tag :id, @project_content_id %>
+  <%= hidden_field_tag :id, @project_content.id %>
   <%= f.hidden_field :id%>
   <%= required labelled_form_field _('Name:'), f.text_field(:name) %> 
-  <div class="formfieldline">
-    <%= f.label :description, "Description:", :class => 'formlabel' %>
-    <div class="formfield type-text">  
-      <%= f.text_field :description %>
-    </div>
-  </div>
+  <%= labelled_form_field _("Description:"), f.text_field(:description) %>
   <%= required labelled_form_field _('License'),
   f.select(:license, MezuroPlugin::Helpers::ContentViewerHelper.license_options, :selected => @repository.license) %>
@@ -28,8 +23,6 @@
   <%= required labelled_form_field _('Configuration'),
   f.select(:configuration_id, @configuration_select, :selected => @repository.configuration_id.to_i) %>
-  <p>
-    <%= f.submit "Add" %>
-  </p>
+  <p> <%= f.submit "Add" %> </p>
 <% end %>
-<h3> <%= link_to( @project_name, homepage_url(@data_profile, @project_name.downcase.gsub(/[^0-9A-Za-z]/, '')) ) %></h3>
+<h2><%= link_to("#{@project_content.name} Project", @project_content.view_url) %></h2>
 <% form_for :repository, :url => {:action =>"create", :controller => "mezuro_plugin_repository"},  :method => :get do |f| %>
-  <%= hidden_field_tag :id, @project_content_id %>
+  <%= hidden_field_tag :id, @project_content.id %>
   <%= required labelled_form_field _('Name:'), f.text_field(:name) %> 
-  <div class="formfieldline">
-    <%= f.label :description, "Description:", :class => 'formlabel' %>
-    <div class="formfield type-text">  
-      <%= f.text_field :description %>
-    </div>
-  </div>
+  <%= labelled_form_field _('Description'), f.text_field(:description) %>
   <%= required labelled_form_field _('License'),
   f.select(:license, MezuroPlugin::Helpers::ContentViewerHelper.license_options) %>
@@ -27,8 +22,6 @@
   <%= required labelled_form_field _('Configuration'),
   f.select(:configuration_id, @configuration_select) %>
-  <p>
-    <%= f.submit "Add" %>
-  </p>
+  <p> <%= f.submit "Add" %> </p>
 <% end %>
 <script src="/plugins/mezuro/javascripts/processing.js" type="text/javascript"></script>
-<h3> <%= link_to( @project_name, homepage_url(@data_profile, @project_name.downcase.gsub(/[^0-9A-Za-z]/, '')) ) %></h3>
+<h2><%= link_to("#{@project_content.name} Project", @project_content.view_url) %></h2>
 <table>
   <tr>
@@ -40,6 +40,6 @@
 </table>
 <br />
-<div id="processing" data-profile="<%= @data_profile %>" data-content="<%= @data_content %>"
+<div id="processing" data-profile="<%= @project_content.profile.identifier %>" data-content="<%= @project_content.id %>"
      data-repository-id="<%= @repository.id %>"></div>
 <div id="module-result"></div>
1	-<h2><%= @configuration_content.name%> Configuration</h2>	1	+<h2><%= link_to("#{@configuration_content.name} Configuration", @configuration_content.view_url) %></h2>
2		2
3	<%= link_to "New Compound Metric", :controller => "mezuro_plugin_metric_configuration", :action => "new_compound",	3	<%= link_to "New Compound Metric", :controller => "mezuro_plugin_metric_configuration", :action => "new_compound",
4	:id => @configuration_content.id %>	4	:id => @configuration_content.id %>
	@@ -2,7 +2,7 @@		@@ -2,7 +2,7 @@
2	<script src="/javascripts/colorpicker.js" type="text/javascript"></script>	2	<script src="/javascripts/colorpicker.js" type="text/javascript"></script>
3	<script src="/javascripts/colorpicker-noosfero.js" type="text/javascript"></script>	3	<script src="/javascripts/colorpicker-noosfero.js" type="text/javascript"></script>
4		4
5	-<h2><%= @configuration_content.name %> Configuration</h2>	5	+<h2><%= link_to("#{@configuration_content.name} Configuration", @configuration_content.view_url) %></h2>
6		6
7	<% owner = (not user.nil?) && user.id == @profile.id %>	7	<% owner = (not user.nil?) && user.id == @profile.id %>
8		8
1	-<h2><%= @configuration_content.name %> Configuration</h2>	1	+<h2><%= link_to("#{@configuration_content.name} Configuration", @configuration_content.view_url) %></h2>
2		2
3	<% form_for :metric_configuration, :url => {:action =>"create_compound", :controller => "mezuro_plugin_metric_configuration"}, :method => :get do \|f\| %>	3	<% form_for :metric_configuration, :url => {:action =>"create_compound", :controller => "mezuro_plugin_metric_configuration"}, :method => :get do \|f\| %>
4	<%= hidden_field_tag :id, @configuration_content.id %>	4	<%= hidden_field_tag :id, @configuration_content.id %>
1	<script src="/plugins/mezuro/javascripts/validations.js" type="text/javascript"></script>	1	<script src="/plugins/mezuro/javascripts/validations.js" type="text/javascript"></script>
2		2
3	-<h2><%= @configuration_content.name %> Configuration</h2>	3	+<h2><%= link_to("#{@configuration_content.name} Configuration", @configuration_content.view_url) %></h2>
4	<!-- TODO This form should be a partial similar to _native_metric_configuration_form.rhtml -->	4	<!-- TODO This form should be a partial similar to _native_metric_configuration_form.rhtml -->
5	<% form_for :metric_configuration, :url => {:action =>"create_native", :controller => "mezuro_plugin_metric_configuration"}, :method => :get do \|f\| %>	5	<% form_for :metric_configuration, :url => {:action =>"create_native", :controller => "mezuro_plugin_metric_configuration"}, :method => :get do \|f\| %>
6		6
1	<script src="/plugins/mezuro/javascripts/processing.js" type="text/javascript"></script>	1	<script src="/plugins/mezuro/javascripts/processing.js" type="text/javascript"></script>
2	-<h3> <%= link_to( @project_name, homepage_url(@data_profile, @project_name.downcase.gsub(/[^0-9A-Za-z]/, '')) ) %></h3>	2	+<h2><%= link_to("#{@project_content.name} Project", @project_content.view_url) %></h2>
3		3
4	<table>	4	<table>
5	<tr>	5	<tr>
	@@ -40,6 +40,6 @@		@@ -40,6 +40,6 @@
40	</table>	40	</table>
41	<br />	41	<br />
42		42
43	-<div id="processing" data-profile="<%= @data_profile %>" data-content="<%= @data_content %>"	43	+<div id="processing" data-profile="<%= @project_content.profile.identifier %>" data-content="<%= @project_content.id %>"
44	data-repository-id="<%= @repository.id %>"></div>	44	data-repository-id="<%= @repository.id %>"></div>
45	<div id="module-result"></div>	45	<div id="module-result"></div>