ENH: refs #0319. Allow top level user folders to be created via web api

Author: zachmullen

core/models/base/FolderModelBase.php

@@ -110,7 +110,7 @@ function createFolder($name, $description, $parent, $uuid = '')
       $parent = $this->load($parentId);
       }
 
-    // Check ifa folder with the same name already exists for the same parent
+    // Check if a folder with the same name already exists for the same parent
     if($parent !== false && $this->getFolderExists($name, $parent))
       {
       $existingfolder = $this->getFolderExists($name, $parent);

modules/api/controllers/components/ApiComponent.php

@@ -704,27 +704,34 @@ function folderCreate($args)
         {
         throw new Exception('Parameter parentid is not defined', MIDAS_INVALID_PARAMETER);
         }
-      $folder = $folderModel->load($args['parentid']);
-      if($folder == false)
-        {
-        throw new Exception('Parent doesn\'t exist', MIDAS_INVALID_PARAMETER);
-        }
-      $new_folder = $folderModel->createFolder($name, $description, $folder, $uuid);
-      if($new_folder === false)
+      if($args['parentid'] == -1) //top level user folder being created
         {
-        throw new Exception('Create folder failed', MIDAS_INTERNAL_ERROR);
+        $new_folder = $folderModel->createFolder($name, $description, $userDao->getFolderId(), $uuid);
         }
-      $policyGroup = $folder->getFolderpolicygroup();
-      $policyUser = $folder->getFolderpolicyuser();
-      $folderpolicygroupModel = $modelLoader->loadModel('Folderpolicygroup');
-      $folderpolicyuserModel = $modelLoader->loadModel('Folderpolicygroup');
-      foreach($policyGroup as $policy)
+      else //child of existing folder
         {
-        $folderpolicygroupModel->createPolicy($policy->getGroup(), $new_folder, $policy->getPolicy());
-        }
-      foreach($policyUser as $policy)
-        {
-        $folderpolicyuserModel->createPolicy($policy->getUser(), $new_folder, $policy->getPolicy());
+        $folder = $folderModel->load($args['parentid']);
+        if($folder == false)
+          {
+          throw new Exception('Parent doesn\'t exist', MIDAS_INVALID_PARAMETER);
+          }
+        $new_folder = $folderModel->createFolder($name, $description, $folder, $uuid);
+        if($new_folder === false)
+          {
+          throw new Exception('Create folder failed', MIDAS_INTERNAL_ERROR);
+          }
+        $policyGroup = $folder->getFolderpolicygroup();
+        $policyUser = $folder->getFolderpolicyuser();
+        $folderpolicygroupModel = $modelLoader->loadModel('Folderpolicygroup');
+        $folderpolicyuserModel = $modelLoader->loadModel('Folderpolicygroup');
+        foreach($policyGroup as $policy)
+          {
+          $folderpolicygroupModel->createPolicy($policy->getGroup(), $new_folder, $policy->getPolicy());
+          }
+        foreach($policyUser as $policy)
+          {
+          $folderpolicyuserModel->createPolicy($policy->getUser(), $new_folder, $policy->getPolicy());
+          }
         }
 
       return $new_folder->toArray();