Return to group views after editing group view layout

htdocs/theme/default/templates/view/blocks.tpl

@@ -63,7 +63,10 @@
             <input class="submit" type="submit" value="{str tag='next'}">
         </form>
 {else}
-        <form action="{$WWWROOT}view/" method="GET">
+        <form action="{$WWWROOT}view/{if $groupid}groupviews.php{/if}" method="GET">
+    {if $groupid}
+            <input type="hidden" name="group" value="{$groupid}">
+    {/if}
             <input class="submit" type="submit" value="{str tag='done'}">
         </form>
 {/if}

htdocs/view/blocks.php

@@ -114,6 +114,7 @@ $smarty->assign('formurl', get_config('wwwroot') . 'view/blocks.php');
 $smarty->assign('category', $category);
 $smarty->assign('new', $new);
 $smarty->assign('view', $view->get('id'));
+$smarty->assign('groupid', $view->get('group'));
 $smarty->assign('can_change_layout', (!$USER->get_account_preference('addremovecolumns') || ($view->get('numcolumns') > 1 && $view->get('numcolumns') < 5)));
 $smarty->display('view/blocks.tpl');