Merged in working feature for new importer

cdevroe · Mar 14, 2014 · bd98e43 · bd98e43
2 parents eaf6453 + fa0a223
commit bd98e43
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 10 deletions.
diff --git a/application/libraries/JSONImportStateMachine/JSONImportStateMarks.php b/application/libraries/JSONImportStateMachine/JSONImportStateMarks.php
@@ -28,7 +28,7 @@ class JSONImportStateMarks implements JSONImportStateInterface
      * @var boolean
      */
     const RETURN_DETAILS_ERRORS_ONLY = true;
-    
+
     /*
      * Result keys
      */
@@ -37,13 +37,13 @@ class JSONImportStateMarks implements JSONImportStateInterface
      * @var string
      */
     const RESULT_ADDED = 'added';
-    
+
     /**
      * Number of marks already existing in the system
      * @var string
      */
     const RESULT_SKIPPED = 'skipped';
-    
+
     /**
      * Number of marks not imported due to errors
      * @var string
@@ -59,7 +59,7 @@ class JSONImportStateMarks implements JSONImportStateInterface
 
     /**
      * Cache for 'unlabeled' label id used to mark entries with unknown label
-     * 
+     *
      * @var int
      */
     private $unlabeled_label_id = null;
@@ -91,7 +91,7 @@ public function processLine($line)
             // Strip trailing comma and simulate JSON
             $jsonLine = mb_ereg_replace("\\,[ ]*$", '', $line);
             $decodedMark = json_decode($jsonLine);
-            $importResult = $this->CI->mark_import->importMark($decodedMark);
+            $importResult = $this->CI->Mark_Import->importMark($decodedMark);
             $this->importData['result']['total'] ++;
             $this->importData['result'][$importResult['result']] ++;
             if (self::RETURN_DETAILS && (! self::RETURN_DETAILS_ERRORS_ONLY || $importResult['result'] === self::RESULT_FAILED || ! empty($importResult['warnings']))) {
@@ -101,4 +101,4 @@ public function processLine($line)
         }
     }
 
-}
+}
diff --git a/assets/css/unmark.css b/assets/css/unmark.css
diff --git a/assets/css/unmark.scss b/assets/css/unmark.scss
@@ -1648,7 +1648,7 @@ body.label-7 .navigation-pane { border-top: none; }
         display: block;
         margin-bottom: 36px;
     }
-    .importer {
+    .importer, .importerHTML {
         display:none;
     }
     small {

diff --git a/assets/js/production/unmark.bookmarklet.js b/assets/js/production/unmark.bookmarklet.js
diff --git a/assets/js/production/unmark.loggedin.js b/assets/js/production/unmark.loggedin.js
diff --git a/assets/js/unmark.client.js b/assets/js/unmark.client.js
@@ -110,6 +110,9 @@
     unmark.import_data = function () {
         return $('.importer').trigger('click');
     };
+    unmark.import_data_html = function () {
+        return $('.importerHTML').trigger('click');
+    };
 
 
 }(window.jQuery));
diff --git a/assets/js/unmark.init.js b/assets/js/unmark.init.js
@@ -142,6 +142,9 @@
         $('.importer').change(function (e) {
             return $('#importForm').submit();
         });
+        $('.importerHTML').change(function (e) {
+            return $('#importFormHTML').submit();
+        });
 
     };