Check if xslt is present or not, before checking the other file upload in the edit front-end logic

Author: coreation

app/Tdt/Core/Definitions/DefinitionController.php

@@ -496,6 +496,8 @@ public function patch($uri)
         $input['username'] = $definition['username'];
         $input['xslt_file'] = $definition['xslt_file'];
 
+        \Log::info($input['xslt_file']);
+
         // Keep associated job
         $input['job_id'] = $definition['job_id'];
 

app/routes.php

@@ -52,24 +52,27 @@
         '/ /'           =>   '_', // nonbreaking space (equiv. to 0x160)
     ];
 
-    $file = strtolower(preg_replace(array_keys($utf8), array_values($utf8), Input::file('fileupload')->getClientOriginalName()));
-
-    $file_xslt_upload=Input::file('fileupload_xslt');
+    $file_xslt_upload = Input::file('fileupload_xslt');
 
     if(isset($file_xslt_upload)) {
         $file_xslt = strtolower(preg_replace(array_keys($utf8), array_values($utf8), Input::file('fileupload_xslt')->getClientOriginalName()));
     }
+
     if(isset($file_xslt)){
         Input::file('fileupload_xslt')->move(
             app_path() . '/storage/app/',
-            $file_xslt . '_' . date('Y-m-d'). '.' . Input::file('fileupload_xslt')->getClientOriginalExtension()
+            $file_xslt . '_' . date('Y-m-d') . '.' . Input::file('fileupload_xslt')->getClientOriginalExtension()
         );
     }
 
-    return Input::file('fileupload')->move(
-        app_path() . '/storage/app/',
-        $file . '_' . time() . '.' . Input::file('fileupload')->getClientOriginalExtension()
-    );
+    if (! empty(Input::file('fileupload'))) {
+        $file = strtolower(preg_replace(array_keys($utf8), array_values($utf8), Input::file('fileupload')->getClientOriginalName()));
+
+        return Input::file('fileupload')->move(
+            app_path() . '/storage/app/',
+            $file . '_' . time() . '.' . Input::file('fileupload')->getClientOriginalExtension()
+        );
+    }
 });
 
 /* Autocomplete endpoint "Linking Datasets" */

dev/js/admin.js

@@ -339,40 +339,13 @@ $('.btn-edit-dataset').on('click', function(e){
     });
 
 	// Check uri source (fileupload field)
-	if( form.find("#fileupload").length == 0 || form.find("#fileupload")[0].files.length == 0 ){
-		// Ajax call: no file selected
-		$.ajax({
-			url: baseURL + "api/definitions/" + identifier,
-			data: JSON.stringify(data),
-			method: "POST",
-			headers: {
-				'Accept' : 'application/json',
-				'Authorization': authHeader
-			},
-			success: function(e){
-				// Done, redirect to datets page
-				window.location = baseURL + 'api/admin/datasets';
-			},
-			error: function(e){
-				if(e.status != 405){
-					var error = JSON.parse(e.responseText);
-					if(error.error && error.error.message){
-						$('.error .text').html(error.error.message);
-						$('.error').removeClass('hide').show().focus();
-					}
-				}else{
-					// Ajax followed location header -> ignore
-					window.location = baseURL + 'api/admin/datasets';
-				}
-			}
-		})
-	} else if(form.find("#fileupload_xslt").length &&  (form.find("#fileupload_xslt").length != 0 || form.find("#fileupload_xslt")[0].files.length != 0) ){
+    if(form.find("#fileupload_xslt").length &&  (form.find("#fileupload_xslt").length != 0 || form.find("#fileupload_xslt")[0].files.length != 0) ){
         // Upload dataset file
+        console.log("upload");
         var file = form.find('input[type=file]')[0].files[0];
         var fd = new FormData();
         fd.append("fileupload", file);
 
-
         // Upload xslt file
         var fileupload_xslt = form.find('#fileupload_xslt')[0].files[0];
         fd.append("fileupload_xslt", fileupload_xslt);
@@ -417,13 +390,41 @@ $('.btn-edit-dataset').on('click', function(e){
             },
             timeout: 10000
         });
-    }
+    } else if(form.find("#fileupload").length == 0 || form.find("#fileupload")[0].files.length == 0 ){
+		// Ajax call: no file selected
+        console.log("no upload");
+		$.ajax({
+			url: baseURL + "api/definitions/" + identifier,
+			data: JSON.stringify(data),
+			method: "POST",
+			headers: {
+				'Accept' : 'application/json',
+				'Authorization': authHeader
+			},
+			success: function(e){
+				// Done, redirect to datets page
+				window.location = baseURL + 'api/admin/datasets';
+			},
+			error: function(e){
+				if(e.status != 405){
+					var error = JSON.parse(e.responseText);
+					if(error.error && error.error.message){
+						$('.error .text').html(error.error.message);
+						$('.error').removeClass('hide').show().focus();
+					}
+				}else{
+					// Ajax followed location header -> ignore
+					window.location = baseURL + 'api/admin/datasets';
+				}
+			}
+		})
+	}
 	else {
 		// Upload dataset file
 		var file = form.find('input[type=file]')[0].files[0];
 		var fd = new FormData();
 		fd.append("fileupload", file);
-
+        console.log("upload the normal file");
 		// Ajax call: upload file
 		$.ajax({
 			async: true,