Download as
Browse Code »

Commit da9bf73dd673df50ea10dc2a3521d93555302ae2

Authored by Rodrigo Souto
1 parent c8036845
Exists in master and in 27 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, temp_ratings, tests, tests_fixies

[template-welcome-page] Add back_to to welcome_page edition

Showing 2 changed files with 7 additions and 1 deletions   Show diff stats
app/controllers/my_profile/profile_editor_controller.rb
  Diff comments   View file @da9bf73
@@ -4,6 +4,7 @@ class ProfileEditorController < MyProfileController @@ -4,6 +4,7 @@ class ProfileEditorController < MyProfileController
4 protect 'destroy_profile', :profile, :only => [:destroy_profile] 4 protect 'destroy_profile', :profile, :only => [:destroy_profile]
5 5
6 before_filter :access_welcome_page, :only => [:welcome_page] 6 before_filter :access_welcome_page, :only => [:welcome_page]
  7 + before_filter :back_to
7 helper_method :has_welcome_page 8 helper_method :has_welcome_page
8 9
9 def index 10 def index
@@ -108,4 +109,9 @@ class ProfileEditorController < MyProfileController @@ -108,4 +109,9 @@ class ProfileEditorController < MyProfileController
108 render_access_denied 109 render_access_denied
109 end 110 end
110 end 111 end
  112 +
  113 + #TODO Consider using this as a general controller feature to be available on every action.
  114 + def back_to
  115 + @back_to = params[:back_to] || request.referer
  116 + end
111 end 117 end
app/views/profile_editor/welcome_page.html.erb
  Diff comments   View file @da9bf73
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 </div> 14 </div>
15 15
16 <% button_bar do%> 16 <% button_bar do%>
17 - <%= submit_button('save', _('Save'), :cancel => {:action => 'index'}) %> 17 + <%= submit_button('save', _('Save'), :cancel => @back_to) %>
18 <% end %> 18 <% end %>
19 <% end %> 19 <% end %>
20 20