Download as
Browse Code »

Commit 8f571c0344862a7fddfbe338a3f730de9336621d

Authored by Victor Costa
2 parents 2ece184b 568e84c9
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Merge branch 'AI3074-community_dashboard' into stable

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/controllers/public/content_viewer_controller.rb
  Diff comments   View file @8f571c0
@@ -70,7 +70,7 @@ class ContentViewerController < ApplicationController @@ -70,7 +70,7 @@ class ContentViewerController < ApplicationController
70 render :action => 'slideshow', :layout => 'slideshow' 70 render :action => 'slideshow', :layout => 'slideshow'
71 return 71 return
72 end 72 end
73 - render :view_page, :formats => [:html] 73 + render @page.view_page, :formats => [:html]
74 end 74 end
75 75
76 def versions_diff 76 def versions_diff
plugins/community_hub/lib/community_hub_plugin/hub.rb
  Diff comments   View file @8f571c0
@@ -54,7 +54,7 @@ class CommunityHubPlugin::Hub < Folder @@ -54,7 +54,7 @@ class CommunityHubPlugin::Hub < Folder
54 end 54 end
55 55
56 def view_page 56 def view_page
57 - "content_viewer/hub.rhtml" 57 + "content_viewer/hub"
58 end 58 end
59 59
60 def mediator?(user) 60 def mediator?(user)