[Groonga-commit] groonga/groonga-admin at bf43c9e [master] Map column'ssources correctly

Back to archive index

YUKI Hiroshi null+****@clear*****
Fri Sep 23 12:25:56 JST 2016


YUKI Hiroshi	2016-09-23 12:25:56 +0900 (Fri, 23 Sep 2016)

  New Revision: bf43c9e57f1388269a833bb920939886fb4fcc2c
  https://github.com/groonga/groonga-admin/commit/bf43c9e57f1388269a833bb920939886fb4fcc2c

  Merged 2dd9aa7: Merge pull request #11 from groonga/features/migrate-column_list-to-schema

  Message:
    Map column'ssources correctly

  Modified files:
    app/scripts/services/schema-loader.js

  Modified: app/scripts/services/schema-loader.js (+6 -1)
===================================================================
--- app/scripts/services/schema-loader.js    2016-09-23 12:25:17 +0900 (19dabf3)
+++ app/scripts/services/schema-loader.js    2016-09-23 12:25:56 +0900 (a6c7252)
@@ -191,7 +191,6 @@ angular.module('groongaAdminApp')
         column.path     = ''; // XXX it exists in a table_list response but missing in a schema response.
         column.type     = rawColumn.type;
         column.sizeType = rawColumn.type;
-        column.sources  = rawColumn.sources.join('|'); // XXX what is the correct delimiter?
         column.table    = rawTable;
 
         column.flags = [];
@@ -200,6 +199,12 @@ angular.module('groongaAdminApp')
             rawColumn.command.arguments.flags)
           column.flags = rawColumn.command.arguments.flags.split('|');
 
+        column.sources = [];
+        if (rawColumn.sources)
+          column.sources = rawColumn.sources.map(function(source) {
+            return source.full_name;
+          });
+
         column.valueType = null;
         if (rawColumn.value_type)
           column.valueType = {
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-commit mailing list
Back to archive index