re #391

app/controllers/course/statusgroups.php

@@ -518,7 +518,8 @@ class Course_StatusgroupsController extends AuthenticatedController
                 $endtime = 0;
             }
         }
-        $position = Statusgruppen::find($group_id)->position;
+        $statusgruppe = Statusgruppen::find($group_id);
+        $position = $statusgruppe->position;
         $group = Statusgruppen::createOrUpdate(
             $group_id,
             Request::get('name'),
@@ -527,7 +528,7 @@ class Course_StatusgroupsController extends AuthenticatedController
             Request::int('selfassign', 0) + Request::int('exclusive', 0),
             strtotime(Request::get('selfassign_start', 'now')),
             Request::get('selfassign_end') ? strtotime(Request::get('selfassign_end')) : 0,
-            Request::int('makefolder', 0),
+            Request::int('makefolder', 0) || $statusgruppe->hasFolder(),
             Request::getArray('dates')
         );
 

lib/models/Statusgruppen.php

@@ -153,7 +153,7 @@ class Statusgruppen extends SimpleORMap implements PrivacyObject
          * Create document folder if requested (ID is needed here,
          * so we do that after store()).
          */
-        if (!$group->hasFolder() && $makefolder) {
+        if ($makefolder) {
             $group->updateFolder(true);
         }
 
@@ -360,6 +360,12 @@ class Statusgruppen extends SimpleORMap implements PrivacyObject
             return $folder->store();
         }
 
+        if ($this->hasFolder() && $set) {
+            $folder = $this->getFolder();
+            $folder->name = _('Dateiordner der Gruppe:') . ' ' . $this->name;
+            return $folder->store();
+        }
+
         // Create new CourseGroupFolder under top folder.
         if (!$this->hasFolder() && $set) {
             $topFolder = Folder::findTopFolder($this->range_id);