Browse Source

Subgroup, organizer changes will redirect with anchor

Maarten van den Berg 7 years ago
parent
commit
e95f535c01
2 changed files with 9 additions and 9 deletions
  1. 5 5
      app/controllers/activities_controller.rb
  2. 4 4
      app/views/activities/edit.html.haml

+ 5 - 5
app/controllers/activities_controller.rb

115
     end
115
     end
116
 
116
 
117
     flash_message(:success, I18n.t('activities.subgroups.edited'))
117
     flash_message(:success, I18n.t('activities.subgroups.edited'))
118
-    redirect_to edit_group_activity_path(@group, @activity)
118
+    redirect_to edit_group_activity_path(@group, @activity, anchor: 'subgroups')
119
   end
119
   end
120
 
120
 
121
   # POST /activities/1/immediate_subgroups
121
   # POST /activities/1/immediate_subgroups
192
     end
192
     end
193
     flash_message(:success, message)
193
     flash_message(:success, message)
194
 
194
 
195
-    redirect_to edit_group_activity_path(@group, @activity)
195
+    redirect_to edit_group_activity_path(@group, @activity, anchor: 'organizers-add')
196
   end
196
   end
197
 
197
 
198
   # PATCH/PUT /activities/1
198
   # PATCH/PUT /activities/1
233
 
233
 
234
     if @subgroup.save
234
     if @subgroup.save
235
       flash_message :success, I18n.t('activities.subgroups.created')
235
       flash_message :success, I18n.t('activities.subgroups.created')
236
-      redirect_to edit_group_activity_path(@group, @activity)
236
+      redirect_to edit_group_activity_path(@group, @activity, anchor: 'subgroups-add')
237
     else
237
     else
238
       flash_message :danger, I18n.t('activities.subgroups.create_failed')
238
       flash_message :danger, I18n.t('activities.subgroups.create_failed')
239
       set_edit_parameters!
239
       set_edit_parameters!
245
   def update_subgroup
245
   def update_subgroup
246
     if @subgroup.update(subgroup_params)
246
     if @subgroup.update(subgroup_params)
247
       flash_message :success, I18n.t('activities.subgroups.updated')
247
       flash_message :success, I18n.t('activities.subgroups.updated')
248
-      redirect_to edit_group_activity_path(@group, @activity)
248
+      redirect_to edit_group_activity_path(@group, @activity, anchor: 'subgroups')
249
     else
249
     else
250
       flash_message :danger, I18n.t('activities.subgroups.update_failed')
250
       flash_message :danger, I18n.t('activities.subgroups.update_failed')
251
       set_edit_parameters!
251
       set_edit_parameters!
257
   def destroy_subgroup
257
   def destroy_subgroup
258
     @subgroup.destroy
258
     @subgroup.destroy
259
     flash_message :success, I18n.t('activities.subgroups.destroyed')
259
     flash_message :success, I18n.t('activities.subgroups.destroyed')
260
-    redirect_to edit_group_activity_path(@group, @activity)
260
+    redirect_to edit_group_activity_path(@group, @activity, anchor: 'subgroups')
261
   end
261
   end
262
 
262
 
263
   # PATCH/PUT /groups/:group_id/activities/:id/presence
263
   # PATCH/PUT /groups/:group_id/activities/:id/presence

+ 4 - 4
app/views/activities/edit.html.haml

7
   = t 'activities.organizers.manage'
7
   = t 'activities.organizers.manage'
8
 .row
8
 .row
9
   .col-md-6
9
   .col-md-6
10
-    %h4
10
+    %h4#organizers-add
11
       = t 'activities.organizers.add'
11
       = t 'activities.organizers.add'
12
     - if @non_organizers.count > 0
12
     - if @non_organizers.count > 0
13
       = form_tag(group_activity_change_organizer_path(@group, @activity), method: 'post') do
13
       = form_tag(group_activity_change_organizer_path(@group, @activity), method: 'post') do
20
       = t 'activities.organizers.no_non_organizers'
20
       = t 'activities.organizers.no_non_organizers'
21
 
21
 
22
   .col-md-6
22
   .col-md-6
23
-    %h4
23
+    %h4#organizers-remove
24
       = t 'activities.organizers.remove'
24
       = t 'activities.organizers.remove'
25
     - if @organizers.count > 0
25
     - if @organizers.count > 0
26
       = form_tag(group_activity_change_organizer_path(@group, @activity), method: 'post') do
26
       = form_tag(group_activity_change_organizer_path(@group, @activity), method: 'post') do
38
 
38
 
39
 .row
39
 .row
40
   .col-md-6
40
   .col-md-6
41
-    %h4
41
+    %h4#subgroups-add
42
       = t 'activities.subgroups.create'
42
       = t 'activities.subgroups.create'
43
 
43
 
44
     = form_for(@subgroup, url: group_activity_create_subgroup_path(@group, @activity), method: :post) do |f|
44
     = form_for(@subgroup, url: group_activity_create_subgroup_path(@group, @activity), method: :post) do |f|
66
 
66
 
67
       = f.submit t('activities.subgroups.create'), class: 'btn btn-success'
67
       = f.submit t('activities.subgroups.create'), class: 'btn btn-success'
68
 
68
 
69
-  .col-md-6
69
+  .col-md-6#subgroups
70
     - if @activity.subgroups.blank?
70
     - if @activity.subgroups.blank?
71
       %p
71
       %p
72
         = t 'activities.subgroups.none'
72
         = t 'activities.subgroups.none'