From a375bb4c64db0d1270d1935b4e277a2fb78e729c Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Fri, 3 Jan 2014 10:06:58 -0300 Subject: [PATCH] Removes trailing spaces from display content plugin --- plugins/display_content/README | 2 +- plugins/display_content/controllers/display_content_plugin_admin_controller.rb | 2 +- plugins/display_content/controllers/display_content_plugin_module.rb | 4 ++-- plugins/display_content/controllers/display_content_plugin_myprofile_controller.rb | 2 +- plugins/display_content/lib/display_content_block.rb | 6 +++--- plugins/display_content/test/functional/display_content_plugin_admin_controller_test.rb | 2 +- plugins/display_content/test/unit/display_content_block_test.rb | 28 ++++++++++++++-------------- plugins/display_content/views/box_organizer/_display_content_block.rhtml | 10 +++++----- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/plugins/display_content/README b/plugins/display_content/README index 1344ccb..5bf8a84 100644 --- a/plugins/display_content/README +++ b/plugins/display_content/README @@ -33,7 +33,7 @@ As a Noosfero administrator user, go to administrator panel: DEVELOPMENT =========== -Noosfero uses jQuery 1.5.1 and the jsTree doesn't works fine with this jQuery version. +Noosfero uses jQuery 1.5.1 and the jsTree doesn't works fine with this jQuery version. Until Noosfero upgrade its JQuery version to a newer one is necessary to load jQuery 1.8.3 inside plugin and apply some changes in jsTree to avoid jQuery conflit. Get the Display Content (Noosfero with Display Content Plugin) development repository: diff --git a/plugins/display_content/controllers/display_content_plugin_admin_controller.rb b/plugins/display_content/controllers/display_content_plugin_admin_controller.rb index 762dafa..c07c5fc 100644 --- a/plugins/display_content/controllers/display_content_plugin_admin_controller.rb +++ b/plugins/display_content/controllers/display_content_plugin_admin_controller.rb @@ -4,6 +4,6 @@ class DisplayContentPluginAdminController < AdminController append_view_path File.join(File.dirname(__FILE__) + '/../views') - include DisplayContentPluginController + include DisplayContentPluginController end diff --git a/plugins/display_content/controllers/display_content_plugin_module.rb b/plugins/display_content/controllers/display_content_plugin_module.rb index 0f29201..0b2bd15 100644 --- a/plugins/display_content/controllers/display_content_plugin_module.rb +++ b/plugins/display_content/controllers/display_content_plugin_module.rb @@ -18,10 +18,10 @@ module DisplayContentPluginController node[:data] = article.title node[:attr] = { 'node_id' => article.id, 'parent_id' => article.parent_id} if block.nodes.include?(article.id) - node[:attr].merge!('class' => 'jstree-checked') + node[:attr].merge!('class' => 'jstree-checked') elsif block.parent_nodes.include?(article.id) node[:children] = get_node(block, article.children) - node[:attr].merge!('class' => 'jstree-undetermined') + node[:attr].merge!('class' => 'jstree-undetermined') end node[:state] = 'closed' if Article.exists?(:parent_id => article.id) nodes.push(node) diff --git a/plugins/display_content/controllers/display_content_plugin_myprofile_controller.rb b/plugins/display_content/controllers/display_content_plugin_myprofile_controller.rb index 22629f0..8dcd901 100644 --- a/plugins/display_content/controllers/display_content_plugin_myprofile_controller.rb +++ b/plugins/display_content/controllers/display_content_plugin_myprofile_controller.rb @@ -4,6 +4,6 @@ class DisplayContentPluginMyprofileController < MyProfileController append_view_path File.join(File.dirname(__FILE__) + '/../views') - include DisplayContentPluginController + include DisplayContentPluginController end diff --git a/plugins/display_content/lib/display_content_block.rb b/plugins/display_content/lib/display_content_block.rb index 5bc5563..8a6b426 100644 --- a/plugins/display_content/lib/display_content_block.rb +++ b/plugins/display_content/lib/display_content_block.rb @@ -41,7 +41,7 @@ class DisplayContentBlock < Block def articles_of_parent(parent = nil) return [] if self.holder.nil? - holder.articles.find(:all, :conditions => {:type => VALID_CONTENT, :parent_id => (parent.nil? ? nil : parent)}) + holder.articles.find(:all, :conditions => {:type => VALID_CONTENT, :parent_id => (parent.nil? ? nil : parent)}) end include ActionController::UrlWriter @@ -74,14 +74,14 @@ class DisplayContentBlock < Block end def display_attribute?(attr) - chosen_attributes.include?(attr) + chosen_attributes.include?(attr) end protected def holder return nil if self.box.nil? || self.box.owner.nil? - if self.box.owner.kind_of?(Environment) + if self.box.owner.kind_of?(Environment) return nil if self.box.owner.portal_community.nil? self.box.owner.portal_community else diff --git a/plugins/display_content/test/functional/display_content_plugin_admin_controller_test.rb b/plugins/display_content/test/functional/display_content_plugin_admin_controller_test.rb index 1eb8d6c..faea36c 100644 --- a/plugins/display_content/test/functional/display_content_plugin_admin_controller_test.rb +++ b/plugins/display_content/test/functional/display_content_plugin_admin_controller_test.rb @@ -19,7 +19,7 @@ class DisplayContentPluginAdminControllerTest < ActionController::TestCase @environment.enabled_plugins = ['DisplayContentPlugin'] @environment.portal_community = fast_create(Community, :name => 'my test profile', :identifier => 'mytestcommunity') @environment.save! - + box = Box.new(:owner => @environment, :position => 1) box.save diff --git a/plugins/display_content/test/unit/display_content_block_test.rb b/plugins/display_content/test/unit/display_content_block_test.rb index e04c879..aac379e 100644 --- a/plugins/display_content/test/unit/display_content_block_test.rb +++ b/plugins/display_content/test/unit/display_content_block_test.rb @@ -312,7 +312,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase Article.delete_all a1 = fast_create(invalid_article, :name => 'test article 1', :profile_id => profile.id) a2 = fast_create(VALID_KIND_OF_ARTICLE.first, :name => 'test article 2', :profile_id => profile.id) - + block = DisplayContentBlock.new box = mock() box.stubs(:owner).returns(profile) @@ -320,7 +320,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase assert_equal [], [a2] - block.articles_of_parent assert_equal [], block.articles_of_parent - [a2] end - + end VALID_KIND_OF_ARTICLE.map do |valid_article| @@ -330,14 +330,14 @@ class DisplayContentBlockTest < ActiveSupport::TestCase Article.delete_all a1 = fast_create(valid_article, :name => 'test article 1', :profile_id => profile.id) a2 = fast_create(INVALID_KIND_OF_ARTICLE.first, :name => 'test article 2', :profile_id => profile.id) - + block = DisplayContentBlock.new box = mock() box.stubs(:owner).returns(profile) block.stubs(:box).returns(box) assert_equal [a1], block.articles_of_parent end - + end should 'list links for all articles title defined in nodes' do @@ -351,7 +351,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase box = mock() block.stubs(:box).returns(box) box.stubs(:owner).returns(profile) - + assert_match /.*#{a1.title}<\/a>/, block.content assert_match /.*#{a2.title}<\/a>/, block.content end @@ -368,7 +368,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase box = mock() block.stubs(:box).returns(box) box.stubs(:owner).returns(profile) - + assert_match /
#{a1.lead}<\/div>/, block.content assert_match /
#{a2.lead}<\/div>/, block.content end @@ -382,7 +382,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase box = mock() block.stubs(:box).returns(box) box.stubs(:owner).returns(profile) - + Article.delete_all assert_match /
    <\/ul>/, block.content end @@ -392,7 +392,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase block = DisplayContentBlock.new block.box = profile.boxes.first block.save! - + params = {:block_id => block.id} params[:controller] = "display_content_plugin_myprofile" params[:profile] = profile.identifier @@ -404,7 +404,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase block = DisplayContentBlock.new block.box = environment.boxes.first block.save! - + params = {:block_id => block.id} params[:controller] = "display_content_plugin_admin" assert_equal params, block.url_params @@ -420,7 +420,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase box = mock() block.stubs(:box).returns(box) box.stubs(:owner).returns(profile) - + assert_match /.*#{a.title}<\/a>/, block.content end @@ -434,7 +434,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase box = mock() block.stubs(:box).returns(box) box.stubs(:owner).returns(profile) - + assert_match /#{a.abstract}/, block.content end @@ -448,7 +448,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase box = mock() block.stubs(:box).returns(box) box.stubs(:owner).returns(profile) - + assert_match /#{a.body}/, block.content end @@ -456,7 +456,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase profile = create_user('testuser').person block = DisplayContentBlock.new - + assert block.display_attribute?('title') end @@ -465,7 +465,7 @@ class DisplayContentBlockTest < ActiveSupport::TestCase block = DisplayContentBlock.new block.chosen_attributes = ['body'] - + assert block.display_attribute?('body') end diff --git a/plugins/display_content/views/box_organizer/_display_content_block.rhtml b/plugins/display_content/views/box_organizer/_display_content_block.rhtml index 051f5ce..f290cc7 100644 --- a/plugins/display_content/views/box_organizer/_display_content_block.rhtml +++ b/plugins/display_content/views/box_organizer/_display_content_block.rhtml @@ -20,15 +20,15 @@ jQuery_1_8_3("#display_content").jstree({ plugins : ["themes","json_data", "checkbox"], checkbox : { - real_checkboxes : true, - real_checkboxes_names : function (n) { return [("block[checked_nodes[" + n.attr('node_id') + "]]"), 1]; } + real_checkboxes : true, + real_checkboxes_names : function (n) { return [("block[checked_nodes[" + n.attr('node_id') + "]]"), 1]; } }, themes : {"theme" : "classic", "icons" : true, "url": "/plugins/display_content/javascripts/jstree/themes/classic/style.css"}, json_data : { - ajax : { - url : '<%= url_for @block.url_params %>', + ajax : { + url : '<%= url_for @block.url_params %>', async: true, - data : function (m) { + data : function (m) { return m.attr ? {"id" : m.attr("node_id")} : {}; } } -- libgit2 0.21.2