diff --git a/src/_h5ai/client/js/inc/core/location.js b/src/_h5ai/client/js/inc/core/location.js index 865a2b2b..0985450a 100644 --- a/src/_h5ai/client/js/inc/core/location.js +++ b/src/_h5ai/client/js/inc/core/location.js @@ -95,7 +95,7 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/event', 'core/settings _.each(json.items, function (jsonItem) { - var e = Item.get(jsonItem.absHref, jsonItem.time, jsonItem.size, jsonItem.isManaged, jsonItem.content); + var e = Item.get(jsonItem.href, jsonItem.time, jsonItem.size, jsonItem.isManaged, jsonItem.content); found[e.absHref] = true; }); diff --git a/src/_h5ai/client/js/inc/model/item.js b/src/_h5ai/client/js/inc/model/item.js index 4b073028..d857c4ae 100644 --- a/src/_h5ai/client/js/inc/model/item.js +++ b/src/_h5ai/client/js/inc/model/item.js @@ -104,8 +104,8 @@ modulejs.define('model/item', ['_', 'core/event', 'core/location', 'core/server' server.request({action: 'get', items: true, itemsHref: self.absHref, itemsWhat: 1}, function (response) { if (response.items) { - _.each(response.items, function (item) { - getItem(item.absHref, item.time, item.size, item.isManaged, item.content); + _.each(response.items, function (jsonItem) { + getItem(jsonItem.href, jsonItem.time, jsonItem.size, jsonItem.isManaged, jsonItem.content); }); } diff --git a/src/_h5ai/server/php/inc/class-item.php b/src/_h5ai/server/php/inc/class-item.php index 6822cd60..9eed1c14 100644 --- a/src/_h5ai/server/php/inc/class-item.php +++ b/src/_h5ai/server/php/inc/class-item.php @@ -55,7 +55,7 @@ class Item { public function to_json_object() { $obj = array( - "absHref" => $this->href, + "href" => $this->href, "time" => $this->date * 1000, // seconds (PHP) to milliseconds (JavaScript) "size" => $this->size );