From a481b727d9bfa98fdf24a056216d0a3cc78694f9 Mon Sep 17 00:00:00 2001 From: Loic GUEGAN Date: Sun, 17 Apr 2016 20:11:46 +0200 Subject: [PATCH 1/7] Begin ... --- client/partials/image/edit.html | 67 ++++++++++++++++++++++++++++++++ client/partials/image/image.html | 51 ++++++++++++------------ 2 files changed, 94 insertions(+), 24 deletions(-) create mode 100644 client/partials/image/edit.html diff --git a/client/partials/image/edit.html b/client/partials/image/edit.html new file mode 100644 index 0000000..be96051 --- /dev/null +++ b/client/partials/image/edit.html @@ -0,0 +1,67 @@ + diff --git a/client/partials/image/image.html b/client/partials/image/image.html index 886a11d..43f1855 100644 --- a/client/partials/image/image.html +++ b/client/partials/image/image.html @@ -6,33 +6,36 @@
- -
- - -
-

- - - - - - - - - - - - - - - - -
NameSizeAction
{{ image.name }}{{ (image.size / 1048576).toFixed(2) }} MB
+ +
+ + +
+

+ + + + + + + + + + + + + + + + +
NameSizeAction
{{ image.name}}{{ (image.size / 1048576).toFixed(2)}} MB + + +
+ -
From ae4e0282310b3ab3fe1d92b24b857bf56ceda09a Mon Sep 17 00:00:00 2001 From: Loic GUEGAN Date: Sun, 17 Apr 2016 20:43:41 +0200 Subject: [PATCH 2/7] Add functionnality --- client/index.html | 3 ++ client/js/controllers/image/edit.js | 13 ++++++ client/js/controllers/image/image.js | 7 +++- client/partials/image/edit.html | 60 ++++++++-------------------- client/partials/image/image.html | 4 +- 5 files changed, 41 insertions(+), 46 deletions(-) create mode 100644 client/js/controllers/image/edit.js diff --git a/client/index.html b/client/index.html index 45bee7f..d941857 100644 --- a/client/index.html +++ b/client/index.html @@ -24,6 +24,7 @@
+
@@ -93,6 +94,8 @@ + + diff --git a/client/js/controllers/image/edit.js b/client/js/controllers/image/edit.js new file mode 100644 index 0000000..3635e21 --- /dev/null +++ b/client/js/controllers/image/edit.js @@ -0,0 +1,13 @@ +/** + * The image controller + * + * @param {$scope} $scope The $scope service from angular + */ +mainApp.controller('editImageCtrl', ['$scope', 'Image', 'Loading', 'Identity', 'upload', function ($scope, Image, Loading, Identity, upload) + { + $scope.$on('editImageEvent', function (eventName, image) { + $scope.image = image; + $('#editImageModal').modal('show'); + console.log(image) + }); + }]); diff --git a/client/js/controllers/image/image.js b/client/js/controllers/image/image.js index d0578d7..b74dc76 100644 --- a/client/js/controllers/image/image.js +++ b/client/js/controllers/image/image.js @@ -3,7 +3,7 @@ * * @param {$scope} $scope The $scope service from angular */ -mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', 'Identity', function ($scope, Image, Loading, Identity) +mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', 'Identity','$rootScope', function ($scope, Image, Loading, Identity, $rootScope) { // Update view @@ -21,4 +21,9 @@ mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', 'Identity', funct callMeAfterGetImage(); } } + + $scope.edit=function(image){ + $rootScope.$broadcast("editImageEvent", image); + + } }]); diff --git a/client/partials/image/edit.html b/client/partials/image/edit.html index be96051..de7b5a0 100644 --- a/client/partials/image/edit.html +++ b/client/partials/image/edit.html @@ -1,4 +1,4 @@ - diff --git a/client/partials/image/image.html b/client/partials/image/image.html index 43f1855..9c17c2f 100644 --- a/client/partials/image/image.html +++ b/client/partials/image/image.html @@ -8,7 +8,7 @@
- +

@@ -25,7 +25,7 @@ {{ image.name}} {{ (image.size / 1048576).toFixed(2)}} MB - + From 5b5f526aa0cce998657c0c4569686ba356ddb77d Mon Sep 17 00:00:00 2001 From: Loic GUEGAN Date: Mon, 18 Apr 2016 13:16:50 +0200 Subject: [PATCH 3/7] Correct bug --- client/js/controllers/image/edit.js | 3 ++- client/js/controllers/image/image.js | 2 +- client/js/services/Image.js | 4 +++- client/partials/image/edit.html | 21 +++++++++++++-------- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/client/js/controllers/image/edit.js b/client/js/controllers/image/edit.js index 3635e21..bab4064 100644 --- a/client/js/controllers/image/edit.js +++ b/client/js/controllers/image/edit.js @@ -5,8 +5,9 @@ */ mainApp.controller('editImageCtrl', ['$scope', 'Image', 'Loading', 'Identity', 'upload', function ($scope, Image, Loading, Identity, upload) { - $scope.$on('editImageEvent', function (eventName, image) { + $scope.$on('editImageEvent', function (eventName, image,axioms) { $scope.image = image; + $scope.axioms=axioms; $('#editImageModal').modal('show'); console.log(image) }); diff --git a/client/js/controllers/image/image.js b/client/js/controllers/image/image.js index b74dc76..1702cb3 100644 --- a/client/js/controllers/image/image.js +++ b/client/js/controllers/image/image.js @@ -23,7 +23,7 @@ mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', 'Identity','$root } $scope.edit=function(image){ - $rootScope.$broadcast("editImageEvent", image); + $rootScope.$broadcast("editImageEvent", image, Image.getData().axioms); } }]); diff --git a/client/js/services/Image.js b/client/js/services/Image.js index 795f85e..190bbb6 100644 --- a/client/js/services/Image.js +++ b/client/js/services/Image.js @@ -4,7 +4,9 @@ mainApp.factory('Image', ['$http', 'Identity', function ($http, Identity) { // Data object var data = {}; data.images = null; // Images - + data.axioms={}; + data.axioms.protected=[true,false]; + data.axioms.visibility=["public", "private"]; /** * Parse uploadImage anwser * @param {type} response diff --git a/client/partials/image/edit.html b/client/partials/image/edit.html index de7b5a0..1200bcd 100644 --- a/client/partials/image/edit.html +++ b/client/partials/image/edit.html @@ -18,15 +18,20 @@

{{ image.name}}

- -
-

{{ image.protected}}

-
- -
-

{{ image.visibility}}

-
+ +
+ + +
+
+ + +
From 7a587387aab354e8101dc04ee54c78ab4b036617 Mon Sep 17 00:00:00 2001 From: Loic GUEGAN Date: Wed, 20 Apr 2016 09:10:02 +0200 Subject: [PATCH 4/7] Debug --- client/js/controllers/image/edit.js | 14 ++++++++++++-- client/js/services/Image.js | 30 ++++++++++++++++++++++++++--- client/partials/image/edit.html | 8 ++++---- 3 files changed, 43 insertions(+), 9 deletions(-) diff --git a/client/js/controllers/image/edit.js b/client/js/controllers/image/edit.js index bab4064..14c1949 100644 --- a/client/js/controllers/image/edit.js +++ b/client/js/controllers/image/edit.js @@ -5,10 +5,20 @@ */ mainApp.controller('editImageCtrl', ['$scope', 'Image', 'Loading', 'Identity', 'upload', function ($scope, Image, Loading, Identity, upload) { - $scope.$on('editImageEvent', function (eventName, image,axioms) { + $scope.$on('editImageEvent', function (eventName, image, axioms) { $scope.image = image; - $scope.axioms=axioms; + $scope.axioms = axioms; $('#editImageModal').modal('show'); console.log(image) }); + $scope.data = {}; + $scope.data.visibility = "public"; + $scope.data.protected = false; + + $scope.updateImage = function (image) { + image.visibility = $scope.data.visibility; + image.protected = $scope.data.protected; + Image.updateImage(image, function(){}); + + }; }]); diff --git a/client/js/services/Image.js b/client/js/services/Image.js index 190bbb6..4dc835e 100644 --- a/client/js/services/Image.js +++ b/client/js/services/Image.js @@ -4,9 +4,9 @@ mainApp.factory('Image', ['$http', 'Identity', function ($http, Identity) { // Data object var data = {}; data.images = null; // Images - data.axioms={}; - data.axioms.protected=[true,false]; - data.axioms.visibility=["public", "private"]; + data.axioms = {}; + data.axioms.protected = [true, false]; + data.axioms.visibility = ["public", "private"]; /** * Parse uploadImage anwser * @param {type} response @@ -55,6 +55,29 @@ mainApp.factory('Image', ['$http', 'Identity', function ($http, Identity) { }; + /** + * Update image + * @param {type} image + * @param {type} callback + * @returns {undefined} + */ + var updateImage = function (image, callback) { + + var result = $http.post('../server/index.php', + $.param({"token": Identity.getToken(), "task": "image", 'action': 'updateImage', 'id': image.id, 'opt': image})); + + // Wait and handle the response + result.then(function (response) { + callback(); + }, function (response) { + alert(response) + }); + + + }; + + + /** * Upload an image * @param {type} fileToUpload @@ -108,6 +131,7 @@ mainApp.factory('Image', ['$http', 'Identity', function ($http, Identity) { // Return services objects return { getImages: getImages, + updateImage: updateImage, getData: getData, uploadImage: uploadImage }; diff --git a/client/partials/image/edit.html b/client/partials/image/edit.html index 1200bcd..32c6958 100644 --- a/client/partials/image/edit.html +++ b/client/partials/image/edit.html @@ -15,20 +15,20 @@
-
+

{{ image.name}}

-
-
@@ -37,7 +37,7 @@
- Apply + Apply
From 91b6918ef3f830c46eac5aa0249edb7f52ba87cd Mon Sep 17 00:00:00 2001 From: Loic GUEGAN Date: Tue, 26 Apr 2016 23:36:33 +0200 Subject: [PATCH 5/7] Change upload --- client/partials/image/upload.html | 5 +++-- server/core/LibOverride/projectTokenData/demo | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/client/partials/image/upload.html b/client/partials/image/upload.html index 01c54b2..641646b 100644 --- a/client/partials/image/upload.html +++ b/client/partials/image/upload.html @@ -16,11 +16,12 @@ - + + - +
diff --git a/server/core/LibOverride/projectTokenData/demo b/server/core/LibOverride/projectTokenData/demo index 95d1e10..deca791 100755 --- a/server/core/LibOverride/projectTokenData/demo +++ b/server/core/LibOverride/projectTokenData/demo @@ -1 +1 @@ -a:2:{s:7:"project";a:7:{s:8:"domainId";s:2:"N;";s:8:"parentId";s:2:"N;";s:7:"enabled";s:2:"N;";s:11:"description";s:2:"N;";s:2:"id";s:40:"s:32:"bdb42ccd0a074d15a9808ed0d2f09ce7";";s:5:"links";s:2:"N;";s:4:"name";s:4:"demo";}s:7:"catalog";a:4:{s:40:"s:32:"52c1f2e9782b47a697df38185d72a3f9";";a:5:{s:4:"name";s:14:"s:7:"neutron";";s:11:"description";s:2:"N;";s:4:"type";s:14:"s:7:"network";";s:9:"endpoints";a:3:{s:40:"s:32:"2c765b2eb502467fba360a1188174f6a";";a:6:{s:9:"interface";s:15:"s:8:"internal";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:30:"s:22:"http://controller:9696";";}s:40:"s:32:"499dc9aeb1c3438fb23b0168d75bbef1";";a:6:{s:9:"interface";s:13:"s:6:"public";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:32:"s:24:"http://148.60.11.31:9696";";}s:40:"s:32:"d0672225fe1a4fce89794f3825deec2b";";a:6:{s:9:"interface";s:12:"s:5:"admin";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:30:"s:22:"http://controller:9696";";}}s:5:"links";s:2:"N;";}s:40:"s:32:"5d48cf5c41b9412a8bfcf87e4b6b4bb4";";a:5:{s:4:"name";s:13:"s:6:"glance";";s:11:"description";s:2:"N;";s:4:"type";s:12:"s:5:"image";";s:9:"endpoints";a:3:{s:40:"s:32:"03aed8cd676d4b1b8b6ed69ba7750d72";";a:6:{s:9:"interface";s:15:"s:8:"internal";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:30:"s:22:"http://controller:9292";";}s:40:"s:32:"06ba5f2c1cb24eaebe3ef3b258ff0841";";a:6:{s:9:"interface";s:13:"s:6:"public";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:32:"s:24:"http://148.60.11.31:9292";";}s:40:"s:32:"32dd6e5e7acd44d88c1e89a4d805a355";";a:6:{s:9:"interface";s:12:"s:5:"admin";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:30:"s:22:"http://controller:9292";";}}s:5:"links";s:2:"N;";}s:40:"s:32:"be984e9e4da645449c645a3dad056d6b";";a:5:{s:4:"name";s:15:"s:8:"keystone";";s:11:"description";s:2:"N;";s:4:"type";s:15:"s:8:"identity";";s:9:"endpoints";a:3:{s:40:"s:32:"0f292b615b544869841c349dbbfead32";";a:6:{s:9:"interface";s:13:"s:6:"public";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:36:"s:28:"http://148.60.11.31:5000/2.0";";}s:40:"s:32:"6a01f770c4014bec933cccc28d378c78";";a:6:{s:9:"interface";s:12:"s:5:"admin";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:36:"s:28:"http://controller:35357/v2.0";";}s:40:"s:32:"d94955c39c784602a1ab49003056a4a4";";a:6:{s:9:"interface";s:15:"s:8:"internal";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:35:"s:27:"http://controller:5000/v2.0";";}}s:5:"links";s:2:"N;";}s:40:"s:32:"edc16c0a3e4042b7b396727fa8e57e7e";";a:5:{s:4:"name";s:11:"s:4:"nova";";s:11:"description";s:2:"N;";s:4:"type";s:14:"s:7:"compute";";s:9:"endpoints";a:3:{s:40:"s:32:"0d61ec232f3b4975b3e3d32f2b7a6122";";a:6:{s:9:"interface";s:13:"s:6:"public";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:68:"s:60:"http://148.60.11.31:8774/v2/bdb42ccd0a074d15a9808ed0d2f09ce7";";}s:40:"s:32:"20ac63e325274a5bbde914f3bb582c45";";a:6:{s:9:"interface";s:12:"s:5:"admin";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:66:"s:58:"http://controller:8774/v2/bdb42ccd0a074d15a9808ed0d2f09ce7";";}s:40:"s:32:"749e7483b9b04dceb1838095dd877aa8";";a:6:{s:9:"interface";s:15:"s:8:"internal";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:66:"s:58:"http://controller:8774/v2/bdb42ccd0a074d15a9808ed0d2f09ce7";";}}s:5:"links";s:2:"N;";}}} \ No newline at end of file +a:2:{s:7:"project";a:7:{s:8:"domainId";s:2:"N;";s:8:"parentId";s:2:"N;";s:7:"enabled";s:2:"N;";s:11:"description";s:2:"N;";s:2:"id";s:40:"s:32:"bdb42ccd0a074d15a9808ed0d2f09ce7";";s:5:"links";s:2:"N;";s:4:"name";s:4:"demo";}s:7:"catalog";a:4:{s:32:"52c1f2e9782b47a697df38185d72a3f9";a:5:{s:4:"name";s:14:"s:7:"neutron";";s:11:"description";s:2:"N;";s:4:"type";s:14:"s:7:"network";";s:9:"endpoints";a:3:{s:32:"2c765b2eb502467fba360a1188174f6a";a:6:{s:9:"interface";s:15:"s:8:"internal";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:30:"s:22:"http://controller:9696";";}s:32:"499dc9aeb1c3438fb23b0168d75bbef1";a:6:{s:9:"interface";s:13:"s:6:"public";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:32:"s:24:"http://148.60.11.31:9696";";}s:32:"d0672225fe1a4fce89794f3825deec2b";a:6:{s:9:"interface";s:12:"s:5:"admin";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:30:"s:22:"http://controller:9696";";}}s:5:"links";s:2:"N;";}s:32:"5d48cf5c41b9412a8bfcf87e4b6b4bb4";a:5:{s:4:"name";s:13:"s:6:"glance";";s:11:"description";s:2:"N;";s:4:"type";s:12:"s:5:"image";";s:9:"endpoints";a:3:{s:32:"03aed8cd676d4b1b8b6ed69ba7750d72";a:6:{s:9:"interface";s:15:"s:8:"internal";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:30:"s:22:"http://controller:9292";";}s:32:"06ba5f2c1cb24eaebe3ef3b258ff0841";a:6:{s:9:"interface";s:13:"s:6:"public";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:32:"s:24:"http://148.60.11.31:9292";";}s:32:"32dd6e5e7acd44d88c1e89a4d805a355";a:6:{s:9:"interface";s:12:"s:5:"admin";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:30:"s:22:"http://controller:9292";";}}s:5:"links";s:2:"N;";}s:32:"be984e9e4da645449c645a3dad056d6b";a:5:{s:4:"name";s:15:"s:8:"keystone";";s:11:"description";s:2:"N;";s:4:"type";s:15:"s:8:"identity";";s:9:"endpoints";a:3:{s:32:"0f292b615b544869841c349dbbfead32";a:6:{s:9:"interface";s:13:"s:6:"public";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:36:"s:28:"http://148.60.11.31:5000/2.0";";}s:32:"6a01f770c4014bec933cccc28d378c78";a:6:{s:9:"interface";s:12:"s:5:"admin";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:36:"s:28:"http://controller:35357/v2.0";";}s:32:"d94955c39c784602a1ab49003056a4a4";a:6:{s:9:"interface";s:15:"s:8:"internal";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:35:"s:27:"http://controller:5000/v2.0";";}}s:5:"links";s:2:"N;";}s:32:"edc16c0a3e4042b7b396727fa8e57e7e";a:5:{s:4:"name";s:11:"s:4:"nova";";s:11:"description";s:2:"N;";s:4:"type";s:14:"s:7:"compute";";s:9:"endpoints";a:3:{s:32:"0d61ec232f3b4975b3e3d32f2b7a6122";a:6:{s:9:"interface";s:13:"s:6:"public";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:68:"s:60:"http://148.60.11.31:8774/v2/bdb42ccd0a074d15a9808ed0d2f09ce7";";}s:32:"20ac63e325274a5bbde914f3bb582c45";a:6:{s:9:"interface";s:12:"s:5:"admin";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:66:"s:58:"http://controller:8774/v2/bdb42ccd0a074d15a9808ed0d2f09ce7";";}s:32:"749e7483b9b04dceb1838095dd877aa8";a:6:{s:9:"interface";s:15:"s:8:"internal";";s:4:"name";s:2:"N;";s:9:"serviceId";s:2:"N;";s:6:"region";s:16:"s:9:"RegionOne";";s:5:"links";s:2:"N;";s:3:"url";s:66:"s:58:"http://controller:8774/v2/bdb42ccd0a074d15a9808ed0d2f09ce7";";}}s:5:"links";s:2:"N;";}}} \ No newline at end of file From ef3054bb8fa6c04b283583aaeb3df8bbdbc001df Mon Sep 17 00:00:00 2001 From: Loic GUEGAN Date: Wed, 27 Apr 2016 15:52:58 +0200 Subject: [PATCH 6/7] Correct bug --- client/js/controllers/image/edit.js | 2 +- client/partials/image/edit.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/js/controllers/image/edit.js b/client/js/controllers/image/edit.js index 14c1949..9bd4975 100644 --- a/client/js/controllers/image/edit.js +++ b/client/js/controllers/image/edit.js @@ -15,7 +15,7 @@ mainApp.controller('editImageCtrl', ['$scope', 'Image', 'Loading', 'Identity', ' $scope.data.visibility = "public"; $scope.data.protected = false; - $scope.updateImage = function (image) { + $scope.applyEdition = function (image) { image.visibility = $scope.data.visibility; image.protected = $scope.data.protected; Image.updateImage(image, function(){}); diff --git a/client/partials/image/edit.html b/client/partials/image/edit.html index 32c6958..4420f52 100644 --- a/client/partials/image/edit.html +++ b/client/partials/image/edit.html @@ -16,7 +16,7 @@
-

{{ image.name}}

+
@@ -37,7 +37,7 @@
- Apply + Apply
From 1cdc04c5f10d57e56a049481d53c3f1006229fcb Mon Sep 17 00:00:00 2001 From: Loic GUEGAN Date: Wed, 27 Apr 2016 16:06:43 +0200 Subject: [PATCH 7/7] Test --- client/js/services/Image.js | 1 - 1 file changed, 1 deletion(-) diff --git a/client/js/services/Image.js b/client/js/services/Image.js index 4dc835e..90f3a48 100644 --- a/client/js/services/Image.js +++ b/client/js/services/Image.js @@ -62,7 +62,6 @@ mainApp.factory('Image', ['$http', 'Identity', function ($http, Identity) { * @returns {undefined} */ var updateImage = function (image, callback) { - var result = $http.post('../server/index.php', $.param({"token": Identity.getToken(), "task": "image", 'action': 'updateImage', 'id': image.id, 'opt': image}));