Download as
Browse Code »

Commit 62ccc88c42d7e76119290c82a0a9acc60318def8

Authored by AntonioTerceiro
1 parent 4c09e30e
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem24: preparing CMS controller to cope with types of articles 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1126 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 5 changed files with 47 additions and 39 deletions   Show diff stats
app/controllers/my_profile/cms_controller.rb
  Diff comments   View file @62ccc88
... ... @@ -6,6 +6,10 @@ class CmsController < MyProfileController
6 6  
7 7 include CmsHelper
8 8  
  9 + ARTICLE_TYPES = [
  10 + TinyMceArticle
  11 + ]
  12 +
9 13 def view
10 14 @article = profile.articles.find(params[:id])
11 15 @subitems = @article.children
... ... @@ -29,10 +33,26 @@ class CmsController < MyProfileController
29 33 end
30 34  
31 35 def new
32   - # FIXME need to display a page and let the user choose a type of article.
33   - type = params[:type] || 'text/html'
  36 + # user must choose an article type first
  37 + type = params[:type]
  38 + if type.blank?
  39 + @article_types = []
  40 + ARTICLE_TYPES.each do |type|
  41 + @article_types.push({
  42 + :name => type.name,
  43 + :short_description => type.short_description,
  44 + :description => type.description
  45 + })
  46 + end
  47 + render :action => 'select_article_type'
  48 + return
  49 + end
  50 +
  51 + raise "Invalid article type #{type}" unless ARTICLE_TYPES.map {|item| item.name}.include?(type)
  52 + klass = type.constantize
  53 + @article = klass.new(params[:article])
  54 +
34 55  
35   - @article = Article.new(params[:article])
36 56 if params[:parent_id]
37 57 @article.parent = profile.articles.find(params[:parent_id])
38 58 end
... ... @@ -63,20 +83,5 @@ class CmsController < MyProfileController
63 83 redirect_to :action => (@article.parent ? 'view' : 'index'), :id => @article.parent
64 84 end
65 85  
66   - protected
67   -
68   - class << self
69   - def available_editors
70   - Dir.glob(File.join(File.dirname(__FILE__), 'cms', '*.rb'))
71   - end
72   -
73   - def available_types
74   - available_editors.map {|item| File.basename(item).gsub(/\.rb$/, '').gsub('_', '/') }
75   - end
76   - end
77   -
78 86 end
79 87  
80   -CmsController.available_editors.each do |item|
81   - load item
82   -end
... ...
app/views/cms/edit.rhtml
  Diff comments   View file @62ccc88
... ... @@ -6,6 +6,8 @@
6 6  
7 7 <% labelled_form_for 'article', @article do |f| %>
8 8  
  9 + <%= hidden_field_tag("type", params[:type]) if params[:type] %>
  10 +
9 11 <%= hidden_field_tag('parent_id', params[:parent_id]) if params[:parent_id] %>
10 12  
11 13 <%= render :partial => partial_for_class(@article.class), :locals => { :f => f } %>
... ...
app/views/cms/select_article_type.rhtml
  Diff comments   View file @62ccc88
... ... @@ -3,7 +3,10 @@
3 3 </p>
4 4  
5 5 <ul>
6   -<% CmsController.available_types.each do |item| %>
7   - <li><%= link_to_new_article(item) %></li>
8   -<% end %>
  6 + <% for type in @article_types %>
  7 + <li>
  8 + <%= link_to type[:short_description], :action => 'new', :type => type[:name] %>
  9 + <p><%= type[:description] %></p>
  10 + </li>
  11 + <% end %>
9 12 </ul>
... ...
test/functional/cms_controller_test.rb
  Diff comments   View file @62ccc88
... ... @@ -52,18 +52,25 @@ class CmsControllerTest &lt; Test::Unit::TestCase
52 52  
53 53 should 'be able to create a new document' do
54 54 get :new, :profile => profile.identifier
  55 + assert_response :success
55 56 assert_template 'select_article_type'
56   - assert_tag :tag => 'form', :attributes => { :action => "/myprofile/#{profile.identifier}/cms/new", :method => /post/i }
  57 +
  58 + # TODO add more types here !!
  59 + [ 'TinyMceArticle' ].each do |item|
  60 + assert_tag :tag => 'a', :attributes => { :href => "/myprofile/#{profile.identifier}/cms/new?type=#{item}" }
  61 + end
57 62 end
58 63  
59 64 should 'present edit screen after choosing article type' do
60   - get :new, :profile => profile.identifier, :article_type => 'Article'
  65 + get :new, :profile => profile.identifier, :type => 'TinyMceArticle'
61 66 assert_template 'edit'
  67 +
  68 + assert_tag :tag => 'form', :attributes => { :action => "/myprofile/#{profile.identifier}/cms/new", :method => /post/i }, :descendant => { :tag => "input", :attributes => { :type => 'hidden', :value => 'TinyMceArticle' }}
62 69 end
63 70  
64   - should 'be able to save a save a document' do
  71 + should 'be able to save a document' do
65 72 assert_difference Article, :count do
66   - post :new, :profile => profile.identifier, :article => { :name => 'a test article', :body => 'the text of the article ...' }
  73 + post :new, :type => 'TinyMceArticle', :profile => profile.identifier, :article => { :name => 'a test article', :body => 'the text of the article ...' }
67 74 end
68 75 end
69 76  
... ... @@ -84,7 +91,7 @@ class CmsControllerTest &lt; Test::Unit::TestCase
84 91 should 'set last_changed_by when creating article' do
85 92 login_as(profile.identifier)
86 93  
87   - post :new, :profile => profile.identifier, :article => { :name => 'changed by me', :body => 'content ...' }
  94 + post :new, :type => 'TinyMceArticle', :profile => profile.identifier, :article => { :name => 'changed by me', :body => 'content ...' }
88 95  
89 96 a = profile.articles.find_by_path('changed-by-me')
90 97 assert_not_nil a
... ... @@ -106,18 +113,6 @@ class CmsControllerTest &lt; Test::Unit::TestCase
106 113 assert_equal profile, a.last_changed_by
107 114 end
108 115  
109   - should 'list available editors' do
110   - editors = [ "#{RAILS_ROOT}/app/controllers/my_profile/cms/bli.rb", "#{RAILS_ROOT}/app/controllers/my_profile/cms/blo.rb" ]
111   - Dir.expects(:glob).with("#{RAILS_ROOT}/app/controllers/my_profile/cms/*.rb").returns(editors)
112   - assert_equal editors, CmsController.available_editors
113   - end
114   -
115   - should 'list available types' do
116   - editors = [ "#{RAILS_ROOT}/app/controllers/my_profile/cms/text_html.rb", "#{RAILS_ROOT}/app/controllers/my_profile/cms/image.rb" ]
117   - CmsController.expects(:available_editors).returns(editors)
118   - assert_equal [ 'text/html', 'image' ], CmsController.available_types
119   - end
120   -
121 116 should 'edit by using the correct template to display the editor depending on the mime-type' do
122 117 a = profile.articles.build(:name => 'test document')
123 118 a.save!
... ...
test/integration/manage_documents_test.rb
  Diff comments   View file @62ccc88
... ... @@ -15,10 +15,13 @@ class ManageDocumentsTest &lt; ActionController::IntegrationTest
15 15 assert_tag :tag => 'a', :attributes => { :href => '/myprofile/myuser/cms' }
16 16 get '/myprofile/myuser/cms/new'
17 17  
  18 + assert_tag :tag => 'a', :attributes => { :href => '/myprofile/myuser/cms/new?type=TinyMceArticle' }
  19 + get '/myprofile/myuser/cms/new?type=TinyMceArticle'
  20 +
18 21 assert_tag :tag => 'form', :attributes => { :action => '/myprofile/myuser/cms/new', :method => /post/i }
19 22  
20 23 assert_difference Article, :count do
21   - post '/myprofile/myuser/cms/new', :article => { :name => 'my article', :body => 'this is the body of ther article'}
  24 + post '/myprofile/myuser/cms/new', :type => 'TinyMceArticle', :article => { :name => 'my article', :body => 'this is the body of ther article'}
22 25 end
23 26  
24 27 assert_response :redirect
... ...