Merge branch 'codebar:master' into member-search

Author: jonodrew

app/controllers/admin/chapters/organisers_controller.rb

@@ -12,6 +12,11 @@ def index
   def create
     authorize :organiser
 
+    if params[:organiser].blank? || params[:organiser][:organiser].blank?
+      flash[:alert] = 'Please select a member to make organiser.'
+      redirect_to admin_chapter_organisers_path(@chapter) and return
+    end
+
     member = Member.find(params[:organiser][:organiser])
     member.add_role(:organiser, @chapter)
 

app/views/layouts/_messages.html.haml

@@ -2,7 +2,7 @@
   - unless (name.eql?('notice') && @suppress_notices) || (name.eql?('warning') && @suppress_warnings)
     - name = name.eql?('notice') ? 'info' : name
     - if msg.is_a?(String)
-      .alert.alert-dismissible.fade.show.mb-0{ 'data-alert': '', class: "alert-#{name}", role: 'alert' }
+      .alert.alert-dismissible.fade.show.mb-0.text-center.bg-warning{ 'data-alert': '', class: "alert-#{name}", role: 'alert' }
         = content_tag :div, msg.html_safe
         %button.btn-close{ type: 'button', 'data-bs-dismiss': 'alert', 'aria-label': 'Close' }
     - elsif msg.is_a?(Array)

spec/features/admin/managing_organisers_spec.rb

@@ -39,6 +39,19 @@
       end
     end
 
+    scenario 'show flash alert warning message if user clicks add organiser without selecting an organiser from the dropdown' do
+      chapter_subscriber = Fabricate(:member)
+      chapter = Fabricate(:chapter_with_groups)
+      Fabricate(:subscription, member: chapter_subscriber, group: chapter.groups.first)
+      visit admin_chapter_organisers_path(chapter)
+
+      click_on 'Add organiser'
+
+      expect(page).to have_content('Please select a member to make organiser.')
+      expect(current_path).to eq(admin_chapter_organisers_path(chapter))
+      expect(page.status_code).to eq(200)
+    end
+
     scenario 'can remove an organiser from a chapter' do
       visit admin_chapter_organisers_path(chapter)
       organiser_name = chapter.organisers.first.full_name