diff options
| -rw-r--r-- | client/js/controllers/image/edit.js | 7 | ||||
| -rw-r--r-- | client/js/services/Image.js | 2 | ||||
| -rwxr-xr-x | client/partials/image/edit.html | 14 |
3 files changed, 14 insertions, 9 deletions
diff --git a/client/js/controllers/image/edit.js b/client/js/controllers/image/edit.js index 120a697..776f88f 100644 --- a/client/js/controllers/image/edit.js +++ b/client/js/controllers/image/edit.js @@ -9,15 +9,18 @@ mainApp.controller('editImageCtrl', ['$scope', 'Image', 'Loading', 'Identity', ' $scope.image = image; $scope.data = {}; $scope.data.id = image.id; + if (image.protected) { + $scope.data.protected = "true"; + } else { + $scope.data.protected = "false"; + } $scope.data.name = image.name; $scope.data.visibility = image.visibility; - $scope.data.protected = image.protected; $scope.axioms = axioms; $('#editImageModal').modal('show'); }); - $scope.data = {}; $scope.applyEdition = function (id) { Image.updateImage($scope.data, function () { diff --git a/client/js/services/Image.js b/client/js/services/Image.js index 6df5ff5..4dda425 100644 --- a/client/js/services/Image.js +++ b/client/js/services/Image.js @@ -5,7 +5,7 @@ mainApp.factory('Image', ['$http', 'Identity', function ($http, Identity) { var data = {}; data.images = null; // Images data.axioms = {}; - data.axioms.protected = [true, false]; + data.axioms.protected = ["false", "true"]; data.axioms.visibility = ["public", "private"]; /** * Parse uploadImage anwser diff --git a/client/partials/image/edit.html b/client/partials/image/edit.html index 0a59c6f..3b37c3b 100755 --- a/client/partials/image/edit.html +++ b/client/partials/image/edit.html @@ -16,20 +16,20 @@ <div class="form-group"> <label class="control-label col-sm-2">Name</label> <div class="col-sm-20"> - <input type="text" ng-model="data.name" value="{{ image.name}}"/> + <input type="text" ng-model="data.name" value="{{ data.name}}"/> </div> </div> <fieldset class="form-group"> <label class="control-label col-sm-2">Visibility</label> - <select class="col-sm-20" id="visibilitySelected" ng-model="data.visibility"> - <option ng-repeat="visibility in axioms.visibility" ng-selected="image.visibility == visibility">{{ visibility}}</option> + <select class="col-sm-20" ng-model="data.visibility"> + <option ng-repeat="visibility in axioms.visibility" ng-selected="data.visibility == visibility">{{ visibility}}</option> </select> </fieldset> <fieldset class="form-group"> <label class="control-label col-sm-2">Protected</label> - <select class="col-sm-20" id="protectedSelected" ng-model="data.protected"> - <option ng-repeat="protected in axioms.protected" ng-selected="image.protected == protected">{{ protected}}</option> + <select class="col-sm-20" ng-model="data.protected"> + <option ng-repeat="protect in axioms.protected" ng-selected="data.protected == protect">{{ protect }}</option> </select> </fieldset> @@ -38,7 +38,9 @@ <input type="hidden" name="task" value="image" /> <input type="hidden" name="token" value="{{ getToken()}}" /> <input type="hidden" name="action" value="uploadImage" /> - <input type="hidden" name="id" value="{{ image.id}}" /> + + <input type="hidden" name="id" value="{{ data.id}}" /> + <input type="hidden" name="file_name" value="cirros-0.3.4-x86_64-disk.img" /> <fieldset class="form-group"> <label class="control-label col-sm-2">Upload</label> |