simplify re-upload

Author: vabarbosa

public/js/seams.js

@@ -149,6 +149,7 @@ seamsApp.controller('seamsController', ['$scope', '$route', '$routeParams', '$lo
 
 	    $scope.$root.fetchRemoteFile = function(fileUrl) {
 	    	if (fileUrl) {
+			    $scope.$root.reUpload = true;
 				$('#remoteFileError').html("");
 			    $scope.$root.fetchingRemoteFile = true;
 				$http.post("/fetch", {"url":fileUrl}, {json: true})
@@ -159,8 +160,9 @@ seamsApp.controller('seamsController', ['$scope', '$route', '$routeParams', '$lo
 				          for(var i in data.fields) {
 				            data.fields[i].safename=data.fields[i].name.toLowerCase().replace(/\W/g,"_");
 				          }
-					      $scope.$root.currentStatus = "uploaded";
+				          $scope.$root.currentStatus = "uploaded";
 				          $scope.$root.schema = data;
+				          $scope.$root.fetchingRemoteFile = false;
 				          $scope.$root.goToNextPage("import");
 					  }
 					  else {
@@ -177,6 +179,7 @@ seamsApp.controller('seamsController', ['$scope', '$route', '$routeParams', '$lo
 	    };
 
 	    $scope.$root.fileUploaded = function() {
+	         $scope.$root.reUpload = true;
 	         $('#fileuploadcontrol').hide();
 	         $('#uploadform').ajaxForm({
 	             beforeSend: function() {
@@ -211,6 +214,7 @@ seamsApp.controller('seamsController', ['$scope', '$route', '$routeParams', '$lo
 	    // the actual import process
 	    $scope.$root.importClicked = function() {
 	      console.log("IMPORT");
+	      $scope.$root.reUpload = false;
 	      $('#importbutton').attr('disabled',true);
 	      $('#backbutton').attr('disabled',true);
 	      $('.import-spinner').css('display','inline-block');

views/templates/upload.html

@@ -5,7 +5,7 @@ <h1 class="type_heading"><mark class="type_mark">Upload Data</mark></h1>
 
 <section class="layout_section theme_dark">
 
-  <div ng-show="!currentStatus || currentStatus == 'new' || reUpload">
+  <div ng-show="!currentStatus || currentStatus == 'new' || $root.reUpload">
     <!--
     <form id="uploadform" action="/upload" method="post" enctype="multipart/form-data">
       <fieldset class="form_field">
@@ -55,14 +55,11 @@ <h1 class="type_heading"><mark class="type_mark">Upload Data</mark></h1>
   </div>
 
   <div ng-show="currentStatus == 'uploaded'" class="alert alert-success">
-    <p class="type_copy">Your{{ reUpload ? ' previous ' : ' ' }}data was uploaded successfully.</p>
+    <p class="type_copy">Your{{ $root.reUpload ? ' previous ' : ' ' }}data was uploaded successfully.</p>
   </div>
 
   <div class="button_group" ng-show="currentStatus && currentStatus != 'new'">
     <button type="button" class="button_primary" ng-click="goToNextPage('import')"> Continue </button>
-    <button ng-show="currentStatus == 'uploaded' && !reUpload" class="button_secondary"
-      type="button" ng-click="reUpload = true;">
-      Re-upload </button>
   </div>
 
 </section>