Update to new version 5.4HEADstable/jermamaster

Signed-off-by: Thomas Duval <thomas.duval@orange.com>
Change-Id: Idcd868133d75928a1ffd74d749ce98503e0555ea

4 files changed, 0 insertions, 297 deletions

diff --git a/moon_gui/static/app/pdp/action/pdp-add.tpl.html b/moon_gui/static/app/pdp/action/pdp-add.tpl.html
deleted file mode 100755
index f83fb85c..00000000
--- a/moon_gui/static/app/pdp/action/pdp-add.tpl.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<div ng-controller="PDPAddController as add" class="modal" tabindex="-1" data-role="modalAddPDP">
-
-	<div class="modal-dialog">
-
-		<div class="modal-content">
-
-			<div class="modal-header">
-				<button type="button" class="close" ng-click="$hide()">&times;</button>
-				<h4 class="modal-title" data-translate="moon.pdp.add.title"></h4>
-			</div>
-			
-			<div class="modal-body">
-				
-				<form class="form-horizontal" role="form" name="add.form">
-				
-					<div class="form-group" ng-class="{'has-error': add.form.name.$invalid && add.form.name.$dirty}">
-					
-		                <label for="name" class="col-sm-3 control-label" data-translate="moon.pdp.add.form.name">Name</label>
-		            
-		                <div class="col-sm-6">
-		            
-		                    <input name="name" id="name" class="form-control" type="text" data-ng-model="add.pdp.name" required />
-		                                        
-		                    <div class="help-block" ng-show="add.form.name.$dirty && add.form.name.$invalid">
-		                    	<small class="error" ng-show="add.form.name.$error.required" data-translate="moon.pdp.add.check.name.required">Name is required</small>
-		                    </div>
-		                    
-		                </div>
-		            </div>
-		            
-		            <div class="form-group" ng-class="{'has-error': add.form.policy.$dirty && (add.form.policy.$invalid || !add.selectedPolicy)}">
-		            
-		                <label class="col-sm-3 control-label" data-translate="moon.pdp.add.form.policy">Policy</label>
-		                
-		                <div class="col-sm-6" ng-if="!add.loadingPolicies">
-		                
-		                    <ui-select ng-model="add.selectedPolicy" name="policy" required>
-		                    	<ui-select-match placeholder="(None)">{{$select.selected.name}}</ui-select-match>
-		                    	<ui-select-choices repeat="policy in add.policies">
-		                    		<div ng-value="policy">{{policy.name}}</div>
-	             				</ui-select-choices>
-		                    </ui-select>
-		                    
-		                    <div class="help-block" ng-show="add.form.policy.$dirty && (add.form.policy.$invalid || !add.selectedPolicy)">
-		                    	<small class="error" ng-show="add.form.policy.$error.required" data-translate="moon.pdp.add.check.policy.required">Policy is required</small>
-		                    </div>
-		                    
-		                </div>
-
-						<div class="col-sm-6" ng-if="add.loadingPolicies">
-							<moon-loader ng-if="add.loadingPolicies" ></moon-loader>
-						</div>
-
-					</div>
-
-		            <div class="form-group">
-
-						<label for="description" class="col-sm-3 control-label" data-translate="moon.pdp.add.form.description">Description</label>
-						<div class="col-sm-6">
-			    			<textarea name="description" id="description" class="form-control" ng-model="add.pdp.description"></textarea>
-		            	</div>
-
-		            </div>
-	            
-				</form>
-				
-			</div>
-			
-			<div class="modal-footer">
-
-				<div class="btn-toolbar" style="float: right;">
-					<a href="" ng-click="$hide()" class="btn btn-default">
-		                <span data-translate="moon.pdp.add.action.cancel">Cancel</span>
-					</a>					
-					<a href="" ng-disabled="add.loading"  ng-click="add.create(add.pdp)" class="btn btn-warning">
-		            	<span class="glyphicon glyphicon-save"></span>
-		                <span data-translate="moon.pdp.add.action.create">Create</span>
-					</a>
-					<moon-loader ng-if="add.loading"></moon-loader>
-				</div>
-
-			</div>
-			
-		</div>
-		
-	</div>
-	
-</div>
diff --git a/moon_gui/static/app/pdp/action/pdp-delete.tpl.html b/moon_gui/static/app/pdp/action/pdp-delete.tpl.html
deleted file mode 100755
index 167ba417..00000000
--- a/moon_gui/static/app/pdp/action/pdp-delete.tpl.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<div ng-controller="PDPDeleteController as del" class="modal" tabindex="-1" data-role="modalDeletePDP">
-
-	<div class="modal-dialog">
-
-		<div class="modal-content">
-
-			<div class="modal-header">
-				<button type="button" class="close" ng-click="$hide()">&times;</button>
-				<h4 class="modal-title" data-translate="moon.pdp.remove.title"></h4>
-			</div>
-			
-			<div class="modal-body">
-				<span data-translate="moon.pdp.remove.content" data-translate-values="{ pdpName: del.pdp.name}"></span>
-			</div>
-			
-			<div class="modal-footer">
-				<div class="btn-toolbar" style="float: right;">
-					<a href="" ng-click="$hide()" class="btn btn-default">
-		                <span data-translate="moon.pdp.remove.action.cancel">Cancel</span>
-					</a>
-
-					<a href="" ng-disabled="del.loading" ng-click="del.remove()" class="btn btn-warning">
-		            	<span class="glyphicon glyphicon-trash"></span>
-		                <span data-translate="moon.pdp.remove.action.delete">Delete</span>
-					</a>
-
-					<moon-loader ng-if="del.loading"></moon-loader>
-				</div>
-			</div>
-			
-		</div>
-		
-	</div>
-	
-</div>
diff --git a/moon_gui/static/app/pdp/action/pdp.controller.add.js b/moon_gui/static/app/pdp/action/pdp.controller.add.js
deleted file mode 100755
index d1c34c79..00000000
--- a/moon_gui/static/app/pdp/action/pdp.controller.add.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * @author arnaud marhin<arnaud.marhin@orange.com>
- */
-
-(function() {
-
-	'use strict';
-					
-	angular
-		.module('moon')
-			.controller('PDPAddController', PDPAddController);
-	
-	PDPAddController.$inject = ['$scope', '$translate', 'alertService', 'formService', 'pdpService', 'policyService', 'utilService'];
-
-	function PDPAddController($scope, $translate, alertService, formService, pdpService, policyService, utilService) {
-		
-		var add = this;
-		
-		/*
-		 * 
-		 */
-		
-		add.form = {};
-		
-		add.pdp = {};
-
-		add.policies = [];
-
-		add.selectedPolicy = null;
-
-		add.loading = false;
-		add.loadingPolicies = true;
-
-		add.create = createPDP;
-		
-		resolvePolicies();
-		
-		/*
-		 *  
-		 */
-		
-		/**
-		 * This function return an array of all policies/template ids
-		 */
-		function resolvePolicies() {
-
-			policyService.findAllWithCallback(function(policies){
-
-				add.policies = policies;
-                add.loadingPolicies = false;
-			});
-			
-		}
-                
-        function createPDP(pdp) {
-        	
-        	if(formService.isInvalid(add.form)) {
-        		
-        		formService.checkFieldsValidity(add.form);
-        	        	
-        	} else {
-
-                add.loading = true;
-
-        		pdpService.data.pdp.create({}, {
-
-        			name: add.pdp.name,
-					description: add.pdp.description,
-					security_pipeline: [add.selectedPolicy.id],
-					keystone_project_id: null
-
-        		}, createSuccess, createError);
-        			        	        	
-    		}
-        	
-        	function createSuccess(data) {
-    			
-    			$translate('moon.pdp.add.success', { pdpName: pdp.name })
-					.then(function (translatedValue) {
-        				alertService.alertSuccess(translatedValue);
-                });
-
-                var createdPdp =  utilService.transformOne(data, 'pdps');
-
-                add.loading = false;
-
-    			$scope.$emit('event:pdpCreatedSuccess', createdPdp);
-    			
-    		}
-    		
-    		function createError(reason) {
-    			
-    			$translate('moon.pdp.add.error', { pdpName: pdp.name })
-					.then(function (translatedValue) {
-        				alertService.alertError(translatedValue);
-                });
-
-                add.loading = false;
-
-    			$scope.$emit('event:pdpCreatedError');
-    			
-    		}
-        	
-        }
-		
-	}
-	
-})();
diff --git a/moon_gui/static/app/pdp/action/pdp.controller.delete.js b/moon_gui/static/app/pdp/action/pdp.controller.delete.js
deleted file mode 100755
index 62557864..00000000
--- a/moon_gui/static/app/pdp/action/pdp.controller.delete.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * @author arnaud marhin<arnaud.marhin@orange.com>
- */
-
-(function() {
-
-	'use strict';
-					
-	angular
-		.module('moon')
-			.controller('PDPDeleteController', PDPDeleteController);
-	
-	PDPDeleteController.$inject = ['$scope', '$translate', 'alertService', 'pdpService'];
-	
-	function PDPDeleteController($scope, $translate, alertService, pdpService) {
-		
-		var del = this;
-		
-		/*
-		 * 
-		 */
-		
-		del.pdp = $scope.pdp;
-		del.loading = false;
-		del.remove = deletePDP;
-		
-		/*
-		 * 
-		 */
-		
-		function deletePDP() {
-            del.loading = true;
-
-			pdpService.data.pdp.remove({pdp_id: del.pdp.id}, deleteSuccess, deleteError);
-			
-			function deleteSuccess(data) {
-
-				$translate('moon.pdp.remove.success', { pdpName: del.pdp.name })
-					.then(function (translatedValue) {
-        			alertService.alertSuccess(translatedValue);
-                });
-
-                del.loading = false;
-
-                $scope.$emit('event:pdpDeletedSuccess', del.pdp);
-				
-			}
-			
-			function deleteError(reason) {
-				
-				$translate('moon.pdp.remove.error', { pdpName: del.pdp.name })
-					.then(function (translatedValue) {
-        			alertService.alertError(translatedValue);
-                });
-
-                del.loading = false;
-
-                $scope.$emit('event:pdpDeletedError', del.pdp);
-				
-			}
-			
-		}
-		
-	}
-	
-})();