Merge pull request #15 from robcalla/master

Fix License Issue #14
OPSILab · Jan 28, 2019 · 5133e68 · 5133e68
2 parents a214609 + a9d3132
commit 5133e68
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 192 deletions.
diff --git a/IdraPortal/pom.xml b/IdraPortal/pom.xml
@@ -28,12 +28,6 @@
 		<!-- <version>3.8.1</version> -->
 		<!-- <scope>test</scope> -->
 		<!-- </dependency> -->
-		<!-- https://mvnrepository.com/artifact/servlets.com/cos -->
-		<dependency>
-			<groupId>servlets.com</groupId>
-			<artifactId>cos</artifactId>
-			<version>05Nov2002</version>
-		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.json/json -->
 		<dependency>
 			<groupId>org.json</groupId>

diff --git a/IdraPortal/src/main/java/it/eng/idraportal/utils/UploadImage.java b/IdraPortal/src/main/java/it/eng/idraportal/utils/UploadImage.java
diff --git a/IdraPortal/src/main/webapp/bower.json b/IdraPortal/src/main/webapp/bower.json
@@ -1,53 +1,52 @@
-{
-	"name": "idraportal",
-	"version": "1.0",
-	"ignore": [
-		"**/.",
-		"node_modules",
-		"bower_components",
-		"test",
-		"tests"
-	],
-	"dependencies": {
-		"angular": "~1.5.9",
-		"ace-builds": "~1.2.0",
-		"angular-mocks": "~1.5.9",
-		"zeroclipboard": "2.2.x",
-		"angular-zeroclipboard": "0.8.x",
-		"angular-xeditable": "0.1.8",
-		"angular-dialog-service": "~5.2.8",
-		"ng-img-crop": "~0.3.2",
-		"ng-tags-input": "3.0.x",
-		"angular-utils-pagination": "0.11.x",
-		"angular-smart-table": "~2.1.3",
-		"spin-js": "2.x",
-		"angular-ui-ace": "~0.2.3",
-		"angular-ui-layout": "~0.0.0",
-		"angular-md5": "~0.1.8",
-		"bootstrap": "3.3.2",
-		"jquery": "~1.10.2",
-		"angular-bootstrap": "~0.13.3",
-		"angular-cookies": "~1.5.9",
-		"angular-route": "~1.5.9",
-		"angular-animate": "~1.5.11",
-		"angular-spinner": "~0.7.0",
-		"angular-sanitize": "~1.5.9",
-		"angular-material": "1.1.8",
-		"angular-aria": "1.5.11",
-		"angular-marked": "~1.x",
-		"angular-file-saver": "~1.x",
-		"flag-icon-css": "~1.x",
-		"ng-country-select": "x",
-		"angular-ui-switch": "x",
-		"angular-underscore-module": "x",
-		"angular-d3-word-cloud": "x",
-		"angular-translate": "x",
-		"angular-translate-storage-local": "x",
-		"angular-translate-storage-cookie": "x",
-		"angular-translate-loader-static-files": "x"
-	},
-	"resolutions": {
-		"angular": "~1.5.9",
-		"angular-bootstrap": "^0.14.3"
-	}
+{
+	"name": "idraportal",
+	"version": "1.0",
+	"ignore": [
+		"**/.",
+		"node_modules",
+		"bower_components",
+		"test",
+		"tests"
+	],
+	"dependencies": {
+		"angular": "~1.5.9",
+		"ace-builds": "~1.2.0",
+		"angular-mocks": "~1.5.9",
+		"zeroclipboard": "2.2.x",
+		"angular-zeroclipboard": "0.8.x",
+		"angular-xeditable": "0.1.8",
+		"angular-dialog-service": "~5.2.8",
+		"ng-img-crop": "~0.3.2",
+		"ng-tags-input": "3.0.x",
+		"angular-utils-pagination": "0.11.x",
+		"angular-smart-table": "~2.1.3",
+		"spin-js": "2.x",
+		"angular-ui-ace": "src0.2.3",
+		"angular-md5": "~0.1.8",
+		"bootstrap": "3.3.2",
+		"jquery": "~1.10.2",
+		"angular-bootstrap": "~0.13.3",
+		"angular-cookies": "~1.5.9",
+		"angular-route": "~1.5.9",
+		"angular-animate": "~1.5.11",
+		"angular-spinner": "~0.7.0",
+		"angular-sanitize": "~1.5.9",
+		"angular-material": "1.1.8",
+		"angular-aria": "1.5.11",
+		"angular-marked": "~1.x",
+		"angular-file-saver": "~1.x",
+		"flag-icon-css": "~1.x",
+		"ng-country-select": "x",
+		"angular-ui-switch": "x",
+		"angular-underscore-module": "x",
+		"angular-d3-word-cloud": "x",
+		"angular-translate": "x",
+		"angular-translate-storage-local": "x",
+		"angular-translate-storage-cookie": "x",
+		"angular-translate-loader-static-files": "x"
+	},
+	"resolutions": {
+		"angular": "~1.5.9",
+		"angular-bootstrap": "^0.14.3"
+	}
 }
diff --git a/IdraPortal/src/main/webapp/catalogues/single_catalogue.js b/IdraPortal/src/main/webapp/catalogues/single_catalogue.js
@@ -254,42 +254,6 @@ angular.module("IdraPlatform").controller('CatalogueCtrl',['$scope','$http','con
 		});     
 		$scope.addFile();
 	};
-
-	$scope.uploadDataUrl = function(){
-		var url = 'UploadImage';
-
-		$http.post(url, {
-			headers: {
-				'Content-Type': 'application/json'
-					},
-			data: {
-				"image": $scope.imageRead,
-				"name": $scope.node.name
-			}
-		})
-			.success(function(data, status, headers, config) { 
-				$scope.node.image = data;
-			})
-			.error(function(data, status, headers, config) {
-				console.log('error');
-			})
-	};
-
-	$scope.addFile = function() {
-
-		var url = 'UploadImage';
-		var fd = new FormData();   
-		fd.append("file",$scope.file);          
-		$http.post(url, fd,{
-			transformRequest: angular.identity,
-			headers: {'Content-Type': undefined} })
-			.success(function(data, status, headers, config) { 
-				$scope.node.image = data;
-			})
-			.error(function(data, status, headers, config) {
-				console.log('error');
-			})
-	};
 
 	if($rootScope.mode == "create" ){
 		//$scope.pageTitle='Add Catalogue';