Merge pull request #3223 from benjaminfaure/fix/plan_visibility

Fix/plan visibility

Author: briri

Gemfile.lock

@@ -3,7 +3,6 @@
 # Controller for the Comments section of the Write Plan page
 class NotesController < ApplicationController
   include ConditionalUserMailer
-  require 'pp'
   after_action :verify_authorized
   respond_to :html
 

app/controllers/notes_controller.rb

@@ -60,7 +60,7 @@ def destroy
       @department = Department.find(params[:id])
       @org_id = org_id
       authorize @department
-      url = "#{admin_edit_org_path(@org_id)}\#departments"
+      url = "#{admin_edit_org_path(@org_id)}#departments"
 
       if @department.destroy
         flash[:notice] = success_message(@department, _('deleted'))

app/controllers/org_admin/departments_controller.rb

@@ -88,11 +88,11 @@ def admin_update
         end
         @org.save
       end
-      redirect_to "#{admin_edit_org_path(@org)}\##{tab}",
+      redirect_to "#{admin_edit_org_path(@org)}##{tab}",
                   notice: success_message(@org, _('saved'))
     else
       failure = failure_message(@org, _('save')) if failure.blank?
-      redirect_to "#{admin_edit_org_path(@org)}\##{tab}", alert: failure
+      redirect_to "#{admin_edit_org_path(@org)}##{tab}", alert: failure
     end
   end
   # rubocop:enable Metrics/AbcSize, Metrics/MethodLength

app/controllers/orgs_controller.rb

@@ -249,7 +249,7 @@ def do_update(require_password = true, confirm = false)
       set_flash_message :notice, success_message(current_user, _('saved'))
       # Sign in the user bypassing validation in case his password changed
       sign_in current_user, bypass: true
-      redirect_to "#{edit_user_registration_path}\#personal-details",
+      redirect_to "#{edit_user_registration_path}#personal-details",
                   notice: success_message(current_user, _('saved'))
 
     else
@@ -280,12 +280,12 @@ def do_update_password(current_user, args)
       set_flash_message :notice, success_message(current_user, _('saved'))
       # TODO: this method is deprecated
       sign_in current_user, bypass: true
-      redirect_to "#{edit_user_registration_path}\#password-details",
+      redirect_to "#{edit_user_registration_path}#password-details",
                   notice: success_message(current_user, _('saved'))
 
     else
       flash[:alert] = message.blank? ? failure_message(current_user, _('save')) : message
-      redirect_to "#{edit_user_registration_path}\#password-details"
+      redirect_to "#{edit_user_registration_path}#password-details"
     end
   end
   # rubocop:enable Metrics/AbcSize, Metrics/PerceivedComplexity

app/controllers/registrations_controller.rb

@@ -127,7 +127,7 @@ def update_email_preferences
     pref.save
 
     # Include active tab in redirect path
-    redirect_to "#{edit_user_registration_path}\#notification-preferences",
+    redirect_to "#{edit_user_registration_path}#notification-preferences",
                 notice: success_message(pref, _('saved'))
   end
   # rubocop:enable Metrics/AbcSize

app/controllers/users_controller.rb

@@ -75,8 +75,6 @@ class Plan < ApplicationRecord
 
   alias_attribute :name, :title
 
-  attribute :visibility, :integer, default: 3
-
   # ================
   # = Associations =
   # ================

app/models/plan.rb

@@ -61,10 +61,7 @@ class Template < ApplicationRecord
   attribute :version, :integer, default: 0
   attribute :customization_of, :integer, default: nil
   attribute :family_id, :integer, default: -> { Template.new_family_id }
-
-  # TODO: re-add visibility setting? (this is handled in org_admin/create and
-  # relies on the org_id in the current callback-form)
-  attribute :visibility, :integer, default: 0
+  attribute :visibility, default: Template.visibilities[:organisationally_visible]
 
   # ================
   # = Associations =

app/models/template.rb

@@ -42,6 +42,7 @@
 FactoryBot.define do
   factory :plan do
     title { Faker::Company.bs }
+    visibility { Plan.visibilities[:privately_visible] }
     template
     org
     identifier { SecureRandom.hex }