Commit-continue

app/controllers/activities_controller.rb

@@ -201,8 +201,13 @@ class ActivitiesController < ApplicationController
   def update
     respond_to do |format|
       if @activity.update(activity_params)
+        redirect = group_activity_path(@group, @activity)
+        if params.has_key?('commit-continue')
+          redirect = edit_group_activity_path(@group, @activity)
+        end
+
         format.html do
-          redirect_to group_activity_url(@group, @activity)
+          redirect_to redirect
           flash_message(:info, I18n.t('activities.updated'))
         end
         format.json { render :show, status: :ok, location: @activity }

app/views/activities/_form.html.erb

@@ -62,7 +62,10 @@
       </div>
     </div>
     <div class="form-group btn-group">
-      <%= f.submit class: 'btn btn-primary' %>
+      <%= submit_tag(t(:save_and_return), class: "btn btn-success") %>
+      <%= f.submit class: 'btn btn-primary', name: "commit-continue" %>
+    </div>
+    <div class="form-group btn-group">
       <% unless activity.new_record? %>
         <%= link_to I18n.t('activities.subgroups.distribute_remaining'),
           { action: 'immediate_subgroups', group_id: activity.group_id, activity_id: activity.id },

config/locales/aardbei_en.yml

@@ -41,6 +41,9 @@ en:
   next: "Next"
   previous: "Previous"
 
+  save_and_return: "Save and return"
+  save: "Save"
+
   somethingbroke: "Something broke!"
 
   areyousure: "Are you sure?"

config/locales/aardbei_nl.yml

@@ -20,6 +20,9 @@ nl:
   next: "Volgende"
   previous: "Vorige"
 
+  save_and_return: "Opslaan en terug"
+  save: "Opslaan"
+
   areyousure: "Weet je het zeker?"
 
   somethingbroke: "Er is iets misgegaan! Neem contact op als dit blijft gebeuren."