Pārlūkot izejas kodu

[indexer] Add labels for field separators

Abraham Elmahrek 11 gadi atpakaļ
vecāks
revīzija
6f459adf5c

+ 2 - 2
desktop/libs/indexer/src/indexer/templates/collections.mako

@@ -208,7 +208,7 @@ ${ commonheader(_('Collection Manager'), "indexer", user, "29px") | n,unicode }
   <div class="control-group" data-bind="css: {'error': fieldSeparator.errors().length > 0}">
     <label for="separator" class="control-label">${_("Separator")}</label>
     <div class="controls">
-      <select data-bind="options: fieldSeparators, value: fieldSeparator" name="separator"></select>
+      <select data-bind="options: fieldSeparators, optionsText: getCharacterLabel, value: fieldSeparator" name="separator"></select>
     </div>
   </div>
 
@@ -384,7 +384,7 @@ ${ commonheader(_('Collection Manager'), "indexer", user, "29px") | n,unicode }
   <div class="control-group" data-bind="css: {'error': fieldSeparator.errors().length > 0}">
     <label for="separator" class="control-label">${_("Separator")}</label>
     <div class="controls">
-      <select data-bind="options: fieldSeparators, value: fieldSeparator" name="separator"></select>
+      <select data-bind="options: fieldSeparators, optionsText: getCharacterLabel, value: fieldSeparator" name="separator"></select>
     </div>
   </div>
 

+ 1 - 1
desktop/libs/indexer/static/js/collections.js

@@ -232,7 +232,7 @@ var CreateCollectionViewModel = function() {
           if (uniqueKeyFields.length > 0) {
             self.collection.uniqueKeyField(uniqueKeyFields[0].name());
           } else if (self.collection.fields().length > 0) {
-            self.collection.uniqueKeyField(self.collection.fields().name());
+            self.collection.uniqueKeyField(self.collection.fields()[0].name());
           }
         } else {
           $(document).trigger("error", data.message);

+ 11 - 0
desktop/libs/indexer/static/js/lib.js

@@ -298,6 +298,17 @@ ko.bindingHandlers.editableText = {
   }
 };
 
+function getCharacterLabel(character) {
+  var LABELS = {
+    '\t': '\\t'
+  };
+  if (LABELS[character]) {
+    return LABELS[character];
+  } else {
+    return character;
+  }
+}
+
 function validateNotNull(obs, message) {
   var ret = true;
   if (!obs()) {