summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--client/js/services/Image.js4
-rwxr-xr-x[-rw-r--r--]server/Test/DisplayListCidr.php0
-rwxr-xr-x[-rw-r--r--]server/Test/getIdNetwork.php0
-rwxr-xr-x[-rw-r--r--]server/Test/getNetwork.php0
-rwxr-xr-x[-rw-r--r--]server/core/Automating.php0
-rwxr-xr-x[-rw-r--r--]server/core/Network.php~0
-rwxr-xr-x[-rw-r--r--]server/vendor/php-opencloud/common/.travis.yml0
7 files changed, 2 insertions, 2 deletions
diff --git a/client/js/services/Image.js b/client/js/services/Image.js
index d427e51..d6c9fed 100644
--- a/client/js/services/Image.js
+++ b/client/js/services/Image.js
@@ -52,13 +52,13 @@ mainApp.factory('Image',[ '$http', 'Identity', function($http, Identity){
form_data.append("token" , Identity.getToken())
form_data.append('action',"uploadImage")
form_data.append('id','6564')
- form_data.append('file_name', fileToUpload.name);
+ form_data.append('file_name', fileToUpload);
$.ajax({
url: "../server/index.php", // Url to which the request is send
type: "POST", // Type of request to be send, called as method
data: form_data, // Data sent to server, a set of key/value pairs (i.e. form fields and values)
- file_name:fileToUpload.name,
+ file_name:fileToUpload,
token : Identity.getToken(),
task : "image",
action:'uploadImage',
diff --git a/server/Test/DisplayListCidr.php b/server/Test/DisplayListCidr.php
index 119b218..119b218 100644..100755
--- a/server/Test/DisplayListCidr.php
+++ b/server/Test/DisplayListCidr.php
diff --git a/server/Test/getIdNetwork.php b/server/Test/getIdNetwork.php
index 1e38627..1e38627 100644..100755
--- a/server/Test/getIdNetwork.php
+++ b/server/Test/getIdNetwork.php
diff --git a/server/Test/getNetwork.php b/server/Test/getNetwork.php
index 4c76480..4c76480 100644..100755
--- a/server/Test/getNetwork.php
+++ b/server/Test/getNetwork.php
diff --git a/server/core/Automating.php b/server/core/Automating.php
index 7f2c654..7f2c654 100644..100755
--- a/server/core/Automating.php
+++ b/server/core/Automating.php
diff --git a/server/core/Network.php~ b/server/core/Network.php~
index 65de962..65de962 100644..100755
--- a/server/core/Network.php~
+++ b/server/core/Network.php~
diff --git a/server/vendor/php-opencloud/common/.travis.yml b/server/vendor/php-opencloud/common/.travis.yml
index f15d253..f15d253 100644..100755
--- a/server/vendor/php-opencloud/common/.travis.yml
+++ b/server/vendor/php-opencloud/common/.travis.yml