diff options
| author | Loic GUEGAN <loic@Manzerbredes.home> | 2016-04-18 13:16:50 +0200 |
|---|---|---|
| committer | Loic GUEGAN <loic@Manzerbredes.home> | 2016-04-18 13:16:50 +0200 |
| commit | 5b5f526aa0cce998657c0c4569686ba356ddb77d (patch) | |
| tree | 95614395326084a7c5071af6ee1e0afc069d29c4 | |
| parent | ae4e0282310b3ab3fe1d92b24b857bf56ceda09a (diff) | |
Correct bug
| -rw-r--r-- | client/js/controllers/image/edit.js | 3 | ||||
| -rw-r--r-- | client/js/controllers/image/image.js | 2 | ||||
| -rw-r--r-- | client/js/services/Image.js | 4 | ||||
| -rw-r--r-- | 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 @@ <div class="col-sm-10"> <p class="form-control-static">{{ image.name}}</p> </div> - <label class="control-label col-sm-2">Protected</label> - <div class="col-sm-10"> - <p class="form-control-static">{{ image.protected}}</p> - </div> - <label class="control-label col-sm-2">Visibility</label> - <div class="col-sm-10"> - <p class="form-control-static">{{ image.visibility}}</p> - </div> + </div> + <fieldset class="form-group"> + <label class="control-label col-sm-2">Visibility</label> + <select class="col-sm-20" id="visibilitySelected"> + <option ng-repeat="visibility in axioms.visibility" ng-selected="image.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"> + <option ng-repeat="protected in axioms.protected" ng-selected="image.protected == protected">{{ protected}}</option> + </select> + </fieldset> </form> <div class="modal-footer"> |