diff --git a/app/views/content_viewer/_article_toolbar.html.erb b/app/views/content_viewer/_article_toolbar.html.erb index 3e9ce65..b371e22 100644 --- a/app/views/content_viewer/_article_toolbar.html.erb +++ b/app/views/content_viewer/_article_toolbar.html.erb @@ -10,7 +10,7 @@ <% if @page != profile.home_page && !@page.has_posts? && @page.allow_delete?(user) && !remove_content_button(:delete)%> <% content = content_tag( 'span', _('Delete') ) %> - <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page}) %> + <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page.id}) %> <% options = {:method => :post, :confirm => delete_article_message(@page)} %> <%= expirable_button @page, :delete, content, url, options %> <% end %> @@ -19,9 +19,9 @@ <% content = content_tag( 'span', _('Spread this') ) %> <% url = nil %> <% if profile.kind_of?(Person) %> - <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page }) %> + <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page.id }) %> <% elsif profile.kind_of?(Community) && environment.portal_community %> - <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish_on_portal_community', :id => @page }) %> + <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish_on_portal_community', :id => @page.id }) %> <% end %> <%= expirable_button @page, :spread, content, url if url %> <% end %> diff --git a/plugins/video/lib/video_block.rb b/plugins/video/lib/video_block.rb index fb7615d..0bc95a2 100644 --- a/plugins/video/lib/video_block.rb +++ b/plugins/video/lib/video_block.rb @@ -1,5 +1,7 @@ class VideoBlock < Block + attr_accessible :url, :width, :height + settings_items :url, :type => :string, :default => "" settings_items :width, :type => :integer, :default => 400 settings_items :height, :type => :integer, :default => 315 -- libgit2 0.21.2