Merge pull request riseuplabs#85 from azul/bugfix/group_pages

fix setting owner during page creation - fix #8311

Author: azul

app/controllers/pages/create_controller.rb

@@ -68,12 +68,10 @@ def init_options
     return true
   end
 
-  #
-  # for some routes, the owner is in the page_id.
-  #
   def set_owner
-    unless params[:owner]
-      params[:owner] = params[:page_id]
+    # owner from form overwrites owner from context
+    if params[:page].present? && params[:page][:owner].present?
+      params[:owner] = params[:page][:owner]
     end
     if params[:owner] == 'me'
       @owner = current_user

test/integration/page_creation_test.rb

@@ -16,6 +16,14 @@ def test_sharing_with_users
     assert_page_users user, public_user, hidden_user
   end
 
+  def test_setting_owner
+    login users(:red)
+    prepare_page :discussion_page
+    select 'rainbow', from: :page_owner
+    click_on :create.t
+    find('#banner_content').assert_text 'rainbow'
+  end
+
   def test_sharing_with_groups
     login
     prepare_page :discussion_page