From 66eabb2c1a84442a50add99e3aa35c6828815ca9 Mon Sep 17 00:00:00 2001 From: Rafael Reggiani Manzo Date: Sat, 30 Apr 2016 09:23:06 -0300 Subject: [PATCH] Remove OrganizationRatings#content --- plugins/organization_ratings/lib/organization_ratings_block.rb | 11 ----------- plugins/organization_ratings/views/blocks/organization_ratings.html.erb | 21 +++++++++++++++++++++ plugins/organization_ratings/views/blocks/organization_ratings_block.html.erb | 21 --------------------- 3 files changed, 21 insertions(+), 32 deletions(-) create mode 100644 plugins/organization_ratings/views/blocks/organization_ratings.html.erb delete mode 100644 plugins/organization_ratings/views/blocks/organization_ratings_block.html.erb diff --git a/plugins/organization_ratings/lib/organization_ratings_block.rb b/plugins/organization_ratings/lib/organization_ratings_block.rb index 58b607c..745ea65 100644 --- a/plugins/organization_ratings/lib/organization_ratings_block.rb +++ b/plugins/organization_ratings/lib/organization_ratings_block.rb @@ -9,17 +9,6 @@ class OrganizationRatingsBlock < Block _('This block displays the organization ratings.') end - def content(args = {}) - block = self - - proc do - render( - :file => 'blocks/organization_ratings_block', - :locals => {:block => block} - ) - end - end - def limit_number_of_ratings env_organization_ratings_config.per_page end diff --git a/plugins/organization_ratings/views/blocks/organization_ratings.html.erb b/plugins/organization_ratings/views/blocks/organization_ratings.html.erb new file mode 100644 index 0000000..6059a08 --- /dev/null +++ b/plugins/organization_ratings/views/blocks/organization_ratings.html.erb @@ -0,0 +1,21 @@ +
+ <%= block_title(block.title, block.subtitle) %> + <% if block.get_ratings(block.owner.id).empty? %> +
+ <%= render :partial => 'shared/make_report_block' %> +
+ <% else %> +
+ <% block.get_ratings(block.owner.id).each_with_index do |r, index| %> + <% break if index >= block.limit_number_of_ratings %> + <%= render :partial => "shared/user_rating_container", :locals => {:user_rate => r} %> + <% end %> + + <%= render :partial => 'shared/make_report_block' %> + +
+ <%= link_to _('See more'), url_for(:controller => 'organization_ratings_plugin_profile', :action => 'new_rating'), :class => 'icon-arrow-right-p' %> +
+
+ <% end %> +
diff --git a/plugins/organization_ratings/views/blocks/organization_ratings_block.html.erb b/plugins/organization_ratings/views/blocks/organization_ratings_block.html.erb deleted file mode 100644 index 6059a08..0000000 --- a/plugins/organization_ratings/views/blocks/organization_ratings_block.html.erb +++ /dev/null @@ -1,21 +0,0 @@ -
- <%= block_title(block.title, block.subtitle) %> - <% if block.get_ratings(block.owner.id).empty? %> -
- <%= render :partial => 'shared/make_report_block' %> -
- <% else %> -
- <% block.get_ratings(block.owner.id).each_with_index do |r, index| %> - <% break if index >= block.limit_number_of_ratings %> - <%= render :partial => "shared/user_rating_container", :locals => {:user_rate => r} %> - <% end %> - - <%= render :partial => 'shared/make_report_block' %> - -
- <%= link_to _('See more'), url_for(:controller => 'organization_ratings_plugin_profile', :action => 'new_rating'), :class => 'icon-arrow-right-p' %> -
-
- <% end %> -
-- libgit2 0.21.2