Download as
Browse Code »

Commit a8bffeabdbe3364f6643e3f8374d8a057d9912d6

Authored by Joenio Costa
Committed by Antonio Terceiro
1 parent d9cfd63a
Exists in master and in 28 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, stable, temp_ratings, tests, tests_fixies

ActionItem868: create new article inside a folder when view child of folder

Showing 2 changed files with 9 additions and 1 deletions   Show diff stats
app/views/content_viewer/view_page.rhtml
  Diff comments   View file @a8bffea
... ... @@ -40,7 +40,7 @@
40 40 { :controller => 'cms', :action => 'publish', :id => @page },
41 41 :class => 'button with-text icon-spread' %>
42 42 <% end %>
43   - <%= lightbox_button(:new, _('New publication'), :controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : nil)) %>
  43 + <%= lightbox_button(:new, _('New publication'), :controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent))) %>
44 44 </div>
45 45 <% end %>
46 46 </div>
... ...
test/functional/content_viewer_controller_test.rb
  Diff comments   View file @a8bffea
... ... @@ -556,4 +556,12 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase
556 556 assert_equal({ :year => year.to_s, :month => month.to_s }, assigns(:page).filter)
557 557 end
558 558  
  559 + should 'give link to create new article inside folder when view child of folder' do
  560 + login_as('testinguser')
  561 + folder = Folder.create!(:name => 'myfolder', :profile => @profile)
  562 + folder.children << TextileArticle.new(:name => 'children-article', :profile => @profile)
  563 + get :view_page, :profile => 'testinguser', :page => [ 'myfolder', 'children-article' ]
  564 + assert_tag :tag => 'div', :attributes => { :class => /main-block/ }, :descendant => { :tag => 'a', :attributes => { :href => "/myprofile/testinguser/cms/new?parent_id=#{folder.id}" } }
  565 + end
  566 +
559 567 end
... ...