Merge branch 'loic-image-edition' into loic
This commit is contained in:
Loic GUEGAN
commit
9a93133272
7 changed files with 135 additions and 28 deletions
|
|
@ -26,6 +26,7 @@
|
|||
<div ng-include="'./partials/home/machineDetails.html'"></div>
|
||||
<div ng-include="'./partials/loading.html'"></div>
|
||||
<div ng-include="'./partials/image/upload.html'"></div>
|
||||
<div ng-include="'./partials/image/edit.html'"></div>
|
||||
|
||||
|
||||
<!-- MAIN GRID -->
|
||||
|
|
@ -95,6 +96,8 @@
|
|||
<script src="./js/controllers/network/network.js"></script>
|
||||
<script src="./js/controllers/image/image.js"></script>
|
||||
<script src="./js/controllers/image/upload.js"></script>
|
||||
<script src="./js/controllers/image/edit.js"></script>
|
||||
|
||||
|
||||
<!-- Includes and dependencies for jointJS -->
|
||||
|
||||
|
|
|
|||
24
client/js/controllers/image/edit.js
Normal file
24
client/js/controllers/image/edit.js
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
/**
|
||||
* 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, axioms) {
|
||||
$scope.image = image;
|
||||
$scope.axioms = axioms;
|
||||
$('#editImageModal').modal('show');
|
||||
console.log(image)
|
||||
});
|
||||
$scope.data = {};
|
||||
$scope.data.visibility = "public";
|
||||
$scope.data.protected = false;
|
||||
|
||||
$scope.applyEdition = function (image) {
|
||||
image.visibility = $scope.data.visibility;
|
||||
image.protected = $scope.data.protected;
|
||||
Image.updateImage(image, function(){});
|
||||
|
||||
};
|
||||
}]);
|
||||
|
|
@ -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
|
||||
var callMeAfterGetImage = function () {
|
||||
|
|
@ -20,4 +20,9 @@ mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', 'Identity', funct
|
|||
callMeAfterGetImage();
|
||||
}
|
||||
}
|
||||
|
||||
$scope.edit=function(image){
|
||||
$rootScope.$broadcast("editImageEvent", image, Image.getData().axioms);
|
||||
|
||||
}
|
||||
}]);
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -53,6 +55,28 @@ 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
|
||||
|
|
@ -106,6 +130,7 @@ mainApp.factory('Image', ['$http', 'Identity', function ($http, Identity) {
|
|||
// Return services objects
|
||||
return {
|
||||
getImages: getImages,
|
||||
updateImage: updateImage,
|
||||
getData: getData,
|
||||
uploadImage: uploadImage
|
||||
};
|
||||
|
|
|
|||
46
client/partials/image/edit.html
Normal file
46
client/partials/image/edit.html
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
<div class="modal fade" id="editImageModal" ng-controller="editImageCtrl">
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content"></div>
|
||||
</div>
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<!--<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>-->
|
||||
<h4 class="modal-title">Edit Image</h4>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="modal-body">
|
||||
|
||||
<form class="form-horizontal" role="form">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-2">Name</label>
|
||||
<div class="col-sm-20">
|
||||
<input type="text" value="{{ image.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>
|
||||
</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>
|
||||
</fieldset>
|
||||
|
||||
</form>
|
||||
<div class="modal-footer">
|
||||
<!--<a href="#" data-dismiss="modal" class="btn btn-default">Close</a>-->
|
||||
|
||||
<a class="btn btn-lg btn-primary btn-block" ng-click="applyEdition(image)" >Apply</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -6,33 +6,36 @@
|
|||
</div>
|
||||
<div class="panel-body">
|
||||
|
||||
|
||||
<div class="btn-group btn-group-md" role="group" aria-label="...">
|
||||
<button type="button" class="btn btn-default" data-toggle="modal" data-target="#uploadImageModal"">Upload</button>
|
||||
<button type="button" class="btn btn-default">Download</button>
|
||||
</div>
|
||||
<p></p>
|
||||
<table class="table table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
<th>Size</th>
|
||||
<th>Action</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="image in images">
|
||||
<td>{{ image.name }}</td>
|
||||
<td>{{ (image.size / 1048576).toFixed(2) }} MB</td>
|
||||
<td><button type="button" class="btn btn-danger">Remove</button></td>
|
||||
</tr>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<div class="btn-group btn-group-md" role="group" aria-label="...">
|
||||
<button type="button" class="btn btn-default" data-toggle="modal" data-target="#uploadImageModal">Upload</button>
|
||||
<button type="button" class="btn btn-default">Download</button>
|
||||
</div>
|
||||
<p></p>
|
||||
<table class="table table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
<th>Size</th>
|
||||
<th>Action</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="image in images">
|
||||
<td>{{ image.name}}</td>
|
||||
<td>{{ (image.size / 1048576).toFixed(2)}} MB</td>
|
||||
<td>
|
||||
<button type="button" class="btn btn-primary" ng-click="edit(image)">Edit</button>
|
||||
<button type="button" class="btn btn-danger">Remove</button>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -16,11 +16,12 @@
|
|||
<input type="hidden" name="task" value="image" />
|
||||
<input type="hidden" name="token" value="{{ token }}" />
|
||||
<input type="hidden" name="action" value="uploadImage" />
|
||||
<input type="hidden" name="id" value="2564" />
|
||||
<input type="hidden" name="id" value="60ed9403-419e-4ea8-933f-dd1750d97360" />
|
||||
<input type="hidden" name="file_name" value="bob.iso" />
|
||||
<input name="file" type="file" />
|
||||
<input type="submit" value="Upload" />
|
||||
</form>
|
||||
|
||||
|
||||
<div class="modal-footer">
|
||||
<!--<a href="#" data-dismiss="modal" class="btn btn-default">Close</a>-->
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue