1 files changed, 21 insertions, 15 deletions

diff --git a/modules/gallery/helpers/item_rest.php b/modules/gallery/helpers/item_rest.php
index 36d2ca62..6869181d 100644
--- a/modules/gallery/helpers/item_rest.php
+++ b/modules/gallery/helpers/item_rest.php
@@ -126,18 +126,19 @@ class item_rest_Core {
         }
       }
     }
+    $item->save();
 
-    $weight = 0;
-    if (isset($request->params->members)) {
+    if (isset($request->params->members) && $item->sort_column == "weight") {
+      $weight = 0;
       foreach ($request->params->members as $url) {
         $child = rest::resolve($url);
         if ($child->parent_id == $item->id && $child->weight != $weight) {
-          $child->weight = $weight++;
+          $child->weight = $weight;
           $child->save();
         }
+        $weight++;
       }
     }
-    $item->save();
   }
 
   static function post($request) {
@@ -151,7 +152,7 @@ class item_rest_Core {
       $item->type = "album";
       $item->parent_id = $parent->id;
       $item->name = $entity->name;
-      $item->title = isset($entity->title) ? $entity->title : $name;
+      $item->title = isset($entity->title) ? $entity->title : $entity->name;
       $item->description = isset($entity->description) ? $entity->description : null;
       $item->slug = isset($entity->slug) ? $entity->slug : null;
       $item->save();
@@ -159,18 +160,23 @@ class item_rest_Core {
 
     case "photo":
     case "movie":
-      $item->type = $entity->type;
-      $item->parent_id = $parent->id;
-      $item->set_data_file($request->file);
-      $item->name = $entity->name;
-      $item->title = isset($entity->title) ? $entity->title : $entity->name;
-      $item->description = isset($entity->description) ? $entity->description : null;
-      $item->slug = isset($entity->slug) ? $entity->slug : null;
-      $item->save();
-      break;
+      if (empty($request->file)) {
+        throw new Rest_Exception(
+          "Bad Request", 400, array("errors" => array("file" => t("Upload failed"))));
+      }
+    $item->type = $entity->type;
+    $item->parent_id = $parent->id;
+    $item->set_data_file($request->file);
+    $item->name = $entity->name;
+    $item->title = isset($entity->title) ? $entity->title : $entity->name;
+    $item->description = isset($entity->description) ? $entity->description : null;
+    $item->slug = isset($entity->slug) ? $entity->slug : null;
+    $item->save();
+    break;
 
     default:
-      throw new Rest_Exception("Invalid type: $entity->type", 400);
+      throw new Rest_Exception(
+        "Bad Request", 400, array("errors" => array("type" => "invalid")));
     }
 
     return array("url" => rest::url("item", $item));