From 50fdbc716fbb5584af1d935d20288d94bfbd6a71 Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Fri, 19 Feb 2016 00:51:02 +1300
Subject: [PATCH] Add minimal validation on CSV uploads

---
 app/common/directives/file-upload.js                     | 5 +++--
 server/www/templates/file-upload/file-upload.html        | 2 +-
 .../www/templates/settings/data-import/data-import.html  | 9 +++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/common/directives/file-upload.js b/app/common/directives/file-upload.js
index 46eee1200a..d38361498c 100644
--- a/app/common/directives/file-upload.js
+++ b/app/common/directives/file-upload.js
@@ -9,10 +9,11 @@ angular.module('ushahidi.common.file-upload', [])
         },
 
         controller: [
-            '$scope',
+            '$scope', '$attrs',
             function (
-                $scope
+                $scope, $attrs
             ) {
+                $scope.required = typeof $attrs.required !== 'undefined';
                 $scope.uploadFile = function ($event) {
                     $scope.fileContainer.file = $event.target.files[0];
                 };
diff --git a/server/www/templates/file-upload/file-upload.html b/server/www/templates/file-upload/file-upload.html
index f4ab82f6cd..3e5fa59082 100644
--- a/server/www/templates/file-upload/file-upload.html
+++ b/server/www/templates/file-upload/file-upload.html
@@ -1,2 +1,2 @@
-<input id="appearance-header-image" name="file" type="file" custom-on-change='uploadFile'/>
+<input id="appearance-header-image" name="file" type="file" custom-on-change='uploadFile' ng-required="{{ required }}" />
 
diff --git a/server/www/templates/settings/data-import/data-import.html b/server/www/templates/settings/data-import/data-import.html
index 2131de93d3..db74dda2bc 100644
--- a/server/www/templates/settings/data-import/data-import.html
+++ b/server/www/templates/settings/data-import/data-import.html
@@ -7,8 +7,9 @@
         </ul>
         <h1 translate>data_import.import</h1>
     </div>
+
     <div class="main-col">
-        <form class="dk-bg">
+        <form class="dk-bg" name="upload">
             <h2 translate>data_import.csv</h2>
             <p><em translate>data_import.import_explanation_csv</em></p>
             <p><em translate>data_import.import_explanation_file_size</em></p>
@@ -18,7 +19,7 @@ <h2 translate>data_import.csv</h2>
             <div class="form-field">
                 <label translate>data_import.post_type</label>
                 <div class="custom-select init">
-                    <select ng-model="formId">
+                    <select ng-model="formId" required>
                         <option value="" selected="selected" translate>data_import.select_post_type</option>
                         <option value="{{form.id}}" ng-repeat="form in forms">
                             {{form.name}}
@@ -28,11 +29,11 @@ <h2 translate>data_import.csv</h2>
             </div>
             <div class="form-field">
                 <label translate>data_import.file_csv</label>
-                <file-upload file-container="fileContainer">
+                <file-upload file-container="fileContainer" required>
                 </file-upload>
             </div>
             <div class="form-field">
-                <button ng-click="importCSV()" type="submit" translate>data_import.import_csv</button>
+                <button ng-disabled="upload.$invalid" ng-click="importCSV()" type="submit" translate>data_import.import_csv</button>
             </div>
         </form>
     </div>