Download as
Browse Code »

Commit 0bee68c899672bf5c8c0a53464a870169d08b359

Authored by AntonioTerceiro
1 parent 65b230c5
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

ActionItem18: using Article instead of Comatose::Page 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@419 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 5 changed files with 11 additions and 2 deletions   Show diff stats
app/controllers/cms_controller.rb
  Diff comments   View file @0bee68c
1 class CmsController < ComatoseAdminController 1 class CmsController < ComatoseAdminController
  2 + define_option :page_class, Article
2 end 3 end
app/controllers/content_viewer_controller.rb
  Diff comments   View file @0bee68c
@@ -4,7 +4,7 @@ class ContentViewerController &lt; ApplicationController @@ -4,7 +4,7 @@ class ContentViewerController &lt; ApplicationController
4 path = params[:page].clone 4 path = params[:page].clone
5 path.unshift(params[:profile]) 5 path.unshift(params[:profile])
6 @path = path.join('/') 6 @path = path.join('/')
7 - @page = Comatose::Page.find_by_path(@path) 7 + @page = Article.find_by_path(@path)
8 if @page.nil? 8 if @page.nil?
9 render :action => 'not_found', :status => 404 9 render :action => 'not_found', :status => 404
10 end 10 end
app/models/article.rb 0 → 100644
  Diff comments   View file @0bee68c
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
  1 +class Article < Comatose::Page
  2 +end
  3 +class Article < Comatose::Page
  4 +end
db/migrate/008_add_comatose_support.rb
  Diff comments   View file @0bee68c
@@ -22,6 +22,10 @@ class AddComatoseSupport &lt; ActiveRecord::Migration @@ -22,6 +22,10 @@ class AddComatoseSupport &lt; ActiveRecord::Migration
22 t.column "version", :integer 22 t.column "version", :integer
23 t.column "updated_on", :datetime 23 t.column "updated_on", :datetime
24 t.column "created_on", :datetime 24 t.column "created_on", :datetime
  25 +
  26 + # added for STI in noosfero
  27 + t.column 'type', :string
  28 +
25 end 29 end
26 Comatose::Page.create_versioned_table 30 Comatose::Page.create_versioned_table
27 puts "Creating the default 'Home Page'..." 31 puts "Creating the default 'Home Page'..."
test/functional/content_viewer_controller_test.rb
  Diff comments   View file @0bee68c
@@ -17,7 +17,7 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase @@ -17,7 +17,7 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase
17 def test_should_display_homepage 17 def test_should_display_homepage
18 uses_host 'anhetegua.net' 18 uses_host 'anhetegua.net'
19 19
20 - Comatose::Page.expects(:find_by_path).with('aprofile').returns(Comatose::Page.new) 20 + Article.expects(:find_by_path).with('aprofile').returns(Article.new)
21 21
22 get :view_page, :profile => 'aprofile', :page => [] 22 get :view_page, :profile => 'aprofile', :page => []
23 assert_response :success 23 assert_response :success