Download as
Browse Code »

Commit 0988fe9d5c48995fce0023ffaa4a10a5544ff519

Authored by Ábner Silva de Oliveira
1 parent 8476dfd0
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

added attribute_accebibles in video_block and fixed bug on article toolbar (dele… 

…te, spread actions) when showing upload file in content_viewer
Showing 2 changed files with 5 additions and 3 deletions   Show diff stats
app/views/content_viewer/_article_toolbar.html.erb
  Diff comments   View file @0988fe9
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 10
11 <% if @page != profile.home_page && !@page.has_posts? && @page.allow_delete?(user) && !remove_content_button(:delete)%> 11 <% if @page != profile.home_page && !@page.has_posts? && @page.allow_delete?(user) && !remove_content_button(:delete)%>
12 <% content = content_tag( 'span', _('Delete') ) %> 12 <% content = content_tag( 'span', _('Delete') ) %>
13 - <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page}) %> 13 + <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page.id}) %>
14 <% options = {:method => :post, :confirm => delete_article_message(@page)} %> 14 <% options = {:method => :post, :confirm => delete_article_message(@page)} %>
15 <%= expirable_button @page, :delete, content, url, options %> 15 <%= expirable_button @page, :delete, content, url, options %>
16 <% end %> 16 <% end %>
@@ -19,9 +19,9 @@ @@ -19,9 +19,9 @@
19 <% content = content_tag( 'span', _('Spread this') ) %> 19 <% content = content_tag( 'span', _('Spread this') ) %>
20 <% url = nil %> 20 <% url = nil %>
21 <% if profile.kind_of?(Person) %> 21 <% if profile.kind_of?(Person) %>
22 - <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page }) %> 22 + <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page.id }) %>
23 <% elsif profile.kind_of?(Community) && environment.portal_community %> 23 <% elsif profile.kind_of?(Community) && environment.portal_community %>
24 - <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish_on_portal_community', :id => @page }) %> 24 + <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish_on_portal_community', :id => @page.id }) %>
25 <% end %> 25 <% end %>
26 <%= expirable_button @page, :spread, content, url if url %> 26 <%= expirable_button @page, :spread, content, url if url %>
27 <% end %> 27 <% end %>
plugins/video/lib/video_block.rb
  Diff comments   View file @0988fe9
1 class VideoBlock < Block 1 class VideoBlock < Block
2 2
  3 + attr_accessible :url, :width, :height
  4 +
3 settings_items :url, :type => :string, :default => "" 5 settings_items :url, :type => :string, :default => ""
4 settings_items :width, :type => :integer, :default => 400 6 settings_items :width, :type => :integer, :default => 400
5 settings_items :height, :type => :integer, :default => 315 7 settings_items :height, :type => :integer, :default => 315