Download as
Browse Code »

Commit 3a2c3b8486d3a3ef49123a4460f2ff9ef2857626

Authored by Rodrigo Souto
Committed by Antonio Terceiro
1 parent 013f1576
Exists in master and in 23 other branches activate_plugin, api_fixies, api_tasks, article_blog_visualization_format, article_layout_refactoring, article_layout_temp, blog_page_bug, clone_article, communities_ratings, design_template, event_layout, fix_forum, fix_optional_fields, fix_suggest_article, folder_improvments, manage_organization, merge_deactive_and_ban, news_page, script_to_update, stable, template_mirror_block, tests, tests_fixies

Redirecting to cms after creating or editing a folder 

(ActionItem1375)
Showing 3 changed files with 39 additions and 0 deletions   Show diff stats
app/controllers/my_profile/cms_controller.rb
  Diff comments   View file @3a2c3b8
@@ -281,6 +281,8 @@ class CmsController < MyProfileController @@ -281,6 +281,8 @@ class CmsController < MyProfileController
281 redirect_to :action => 'media_listing' 281 redirect_to :action => 'media_listing'
282 elsif @article.parent 282 elsif @article.parent
283 redirect_to :action => 'view', :id => @article.parent 283 redirect_to :action => 'view', :id => @article.parent
  284 + elsif @article.folder? && !@article.blog? && @article.parent
  285 + redirect_to :action => 'index'
284 else 286 else
285 redirect_back_or_default :action => 'index' 287 redirect_back_or_default :action => 'index'
286 end 288 end
features/create_article.feature 0 → 100644
  Diff comments   View file @3a2c3b8
@@ -0,0 +1,35 @@ @@ -0,0 +1,35 @@
  1 +Feature: create article
  2 + As a noosfero user
  3 + I want to create new articles
  4 +
  5 + Background:
  6 + Given I am on the homepage
  7 + And the following users
  8 + | login | name |
  9 + | joaosilva | Joao Silva |
  10 + And I am logged in as "joaosilva"
  11 +
  12 + Scenario: create a folder
  13 + Given I am on Joao Silva's control panel
  14 + And I follow "Manage Content"
  15 + When I follow "New Folder"
  16 + And I fill in "Title" with "My Folder"
  17 + And I press "Save"
  18 + And I go to Joao Silva's control panel
  19 + Then I should see "My Folder"
  20 +
  21 + Scenario: redirect to the created folder
  22 + Given I am on Joao Silva's control panel
  23 + And I follow "Manage Content"
  24 + When I follow "New Folder"
  25 + And I fill in "Title" with "My Folder"
  26 + And I press "Save"
  27 + Then I should see "Content management"
  28 + And I should be on Joao Silva's cms
  29 +
  30 + Scenario: cancel button back to cms
  31 + Given I follow "Control panel"
  32 + And I follow "Manage Content"
  33 + And I follow "New Folder"
  34 + When I follow "Cancel"
  35 + Then I should be on Joao Silva's cms
features/support/paths.rb
  Diff comments   View file @3a2c3b8
@@ -35,6 +35,8 @@ module NavigationHelpers @@ -35,6 +35,8 @@ module NavigationHelpers
35 when /^(.*)'s control panel$/ 35 when /^(.*)'s control panel$/
36 '/myprofile/%s' % Profile.find_by_name($1).identifier 36 '/myprofile/%s' % Profile.find_by_name($1).identifier
37 37
  38 + when /^(.+)'s cms/
  39 + '/myprofile/%s/cms' % Profile.find_by_name($1).identifier
38 # Add more mappings here. 40 # Add more mappings here.
39 # Here is a more fancy example: 41 # Here is a more fancy example:
40 # 42 #