summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/gallery/helpers/item_rest.php80
-rw-r--r--modules/gallery/helpers/items_rest.php12
-rw-r--r--modules/organize/js/organize.js17
-rw-r--r--modules/rest/controllers/rest.php8
4 files changed, 99 insertions, 18 deletions
diff --git a/modules/gallery/helpers/item_rest.php b/modules/gallery/helpers/item_rest.php
index 16abec5a..32b9c620 100644
--- a/modules/gallery/helpers/item_rest.php
+++ b/modules/gallery/helpers/item_rest.php
@@ -70,6 +70,8 @@ class item_rest_Core {
$orm->where("type", "IN", explode(",", $p->type));
}
+ // Respect the requested ordering
+ $orm->order_by($item->sort_column, $item->sort_order);
$members = array();
foreach ($orm->find_all() as $child) {
$members[] = rest::url("item", $child);
@@ -88,35 +90,91 @@ class item_rest_Core {
$params = $request->params;
+ $sort_order_changed_to_weight = false;
+ // Start the batch
+ batch::start();
+
// Only change fields from a whitelist.
foreach (array("album_cover", "captured", "description",
"height", "mime_type", "name", "parent", "rand_key", "resize_dirty",
"resize_height", "resize_width", "slug", "sort_column", "sort_order",
"thumb_dirty", "thumb_height", "thumb_width", "title", "view_count",
"weight", "width") as $key) {
- switch ($key) {
- case "album_cover":
- if (property_exists($request->params, "album_cover")) {
+ if (property_exists($request->params, $key)) {
+ switch ($key) {
+ case "album_cover":
$album_cover_item = rest::resolve($request->params->album_cover);
access::required("view", $album_cover_item);
$item->album_cover_item_id = $album_cover_item->id;
- }
- break;
-
- case "parent":
- if (property_exists($request->params, "parent")) {
+ break;
+
+ case "sort_column":
+ if ($request->params->sort_column == "weight" && $item->sort_column != "weight") {
+ $sort_order_changed_to_weight = true;
+ $item->sort_column = "weight";
+ }
+ break;
+ case "parent":
$parent = rest::resolve($request->params->parent);
access::required("edit", $parent);
$item->parent_id = $parent->id;
- }
break;
- default:
- if (property_exists($request->params, $key)) {
+ default:
$item->$key = $request->params->$key;
}
}
}
$item->save();
+
+ // If children are supplied, then update the children based on that client tells us.
+ // if the sort order changed, then update the weights if there are no children to be updated
+ if (property_exists($request->params, "children")) {
+ // Map the existing children by their restful urls
+ $children = array();
+ foreach ($item->children() as $child) {
+ $children[rest::url("item", $child)] = $child;
+ }
+ $update_weight = $item->sort_column == "weight";
+ $weight = $item->sort_order == "ASC" ? -1 : $request->params->url->length;
+ $weight_increment = $item->sort_order == "ASC" ? 1 : -1;
+
+ foreach($request->params->children as $url) {
+ if (isset($children[$url])) {
+ $child = $children[$url];
+ unset($children[$url]);
+ } else {
+ $child = rest::resolve($url);
+ $child->parent_id = $item->id;
+ }
+ $child->save();
+ if ($update_weight) {
+ $weight += $weight_increment;
+ db::build()
+ ->update("items")
+ ->set("weight", $weight)
+ ->where("id", "=", $child->id)
+ ->execute();
+ }
+ }
+ // Anything left in the mapping needs to be deleted
+ foreach ($children as $child) {
+ $child->delete();
+ }
+ } else if ($sort_order_changed_to_weight) {
+ $weight = $item->sort_order == "ASC" ? -1 : $request->params->url->length;
+ $weight_increment = $item->sort_order == "ASC" ? 1 : -1;
+ foreach ($item->children() as $child) {
+ // Do this directly in the database to avoid sending notifications
+ $weight += $weight_increment;
+ db::build()
+ ->update("items")
+ ->set("weight", $weight)
+ ->where("id", "=", $child->id)
+ ->execute();
+ }
+ }
+
+ batch::stop();
}
static function post($request) {
diff --git a/modules/gallery/helpers/items_rest.php b/modules/gallery/helpers/items_rest.php
index 05ca65cf..48839dc9 100644
--- a/modules/gallery/helpers/items_rest.php
+++ b/modules/gallery/helpers/items_rest.php
@@ -19,10 +19,12 @@
*/
class items_rest_Core {
static function get($request) {
+ $parent = rest::resolve($request->url);
+ access::required("view", $parent);
$items = array();
if (isset($request->params->url)) {
- foreach($request->params->url as $url) {
+ foreach ($request->params->url as $url) {
$item = rest::resolve($url);
if (access::can("view", $item)) {
$members = array();
@@ -41,4 +43,12 @@ class items_rest_Core {
return $items;
}
+
+ static function resolve($id) {
+ $item = ORM::factory("item", $id);
+ if (!access::can("view", $item)) {
+ throw new Kohana_404_Exception();
+ }
+ return $item;
+ }
}
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index 5a483caf..fcadeef9 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -6,7 +6,7 @@
cursorAt: { left: -10, top: -10},
appendTo: "#g-organize-content-pane",
helper: function(event, ui) {
- var selected = $(".ui-draggable.ui-selected img");
+ var selected = $(".ui-selected");
var set = $('<div class="g-drag-helper"></div>')
.css({
zIndex: 2000,
@@ -17,10 +17,11 @@
selected.each(function(i) {
var row = parseInt(i / 5);
var j = i - (row * 5);
- var o = $(this).offset();
- var copy = $(this).clone()
+ var img = $("img", this);
+ var o = img.offset();
+ var copy = img.clone()
.css({
- width: $(this).width(), height: $(this).height(), display: "block",
+ width: img.width(), height: img.height(), display: "block",
margin: 0, position: 'absolute', outline: '5px solid #fff',
left: o.left - event.pageX, top: o.top - event.pageY
})
@@ -135,6 +136,7 @@
},
grid_mouse_move_handler: function(event) {
+ var continue_events = true;
if ($(".g-drag-helper").length) {
var organizeData = $("#g-organize").data("organizeData");
var thumbGrid = $("#g-organize-microthumb-grid");
@@ -170,8 +172,13 @@
.data("drop_position", {id: $(item).attr("ref"),
position: organizeData.rtl ? !before : before});
thumbGrid.append(set);
+ if ($.browser.msie) {
+ $(".g-drag-helper").offset({top: event.pageY, left: event.PageX});
+ event.preventDefault();
+ continue_events = false;
+ }
}
- return true;
+ return continue_events;
},
/**
diff --git a/modules/rest/controllers/rest.php b/modules/rest/controllers/rest.php
index 9f9b9aff..13594763 100644
--- a/modules/rest/controllers/rest.php
+++ b/modules/rest/controllers/rest.php
@@ -41,12 +41,13 @@ class Rest_Controller extends Controller {
public function __call($function, $args) {
$input = Input::instance();
$request = new stdClass();
+
switch ($method = strtolower($input->server("REQUEST_METHOD"))) {
case "get":
$request->params = (object) $input->get();
break;
- case "post":
+ default:
$request->params = (object) $input->post();
if (isset($_FILES["file"])) {
$request->file = upload::save("file");
@@ -56,6 +57,11 @@ class Rest_Controller extends Controller {
$request->method = strtolower($input->server("HTTP_X_GALLERY_REQUEST_METHOD", $method));
$request->access_token = $input->server("HTTP_X_GALLERY_REQUEST_KEY");
+
+ if (empty($request->access_token) && !empty($request->params->access_token)) {
+ $request->access_token = $request->params->access_token;
+ }
+
$request->url = url::abs_current(true);
rest::set_active_user($request->access_token);
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 18:54:12 +0000