Răsfoiți Sursa

[search] Update collection data when selecting another one

Romain Rigaux 10 ani în urmă
părinte
comite
1b1d770328

+ 1 - 1
apps/search/src/search/models.py

@@ -456,7 +456,7 @@ class Collection2(object):
           'layout': []
       }
 
-  def get_c(self, user):
+  def get_json(self, user):
     props = self.data
 
     if self.document is not None:

+ 1 - 1
apps/search/src/search/templates/search.mako

@@ -1819,7 +1819,7 @@ $(document).ready(function () {
     }
   }
 
-  viewModel = new SearchViewModel(${ collection.get_c(user) | n,unicode }, _query, ${ initial | n,unicode });
+  viewModel = new SearchViewModel(${ collection.get_json(user) | n,unicode }, _query, ${ initial | n,unicode });
 
   viewModel.timelineChartTypes = ko.observableArray([
     {

+ 5 - 6
apps/search/src/search/views.py

@@ -306,14 +306,13 @@ def index_fields_dynamic(request):
 
   try:
     name = request.POST['name']
-    hue_collection = Collection(name=name, label=name)
 
-    dynamic_fields = SolrApi(SOLR_URL.get(), request.user).luke(hue_collection.name)
+    dynamic_fields = SolrApi(SOLR_URL.get(), request.user).luke(name)
 
     result['message'] = ''
-    result['fields'] = [Collection._make_field(name, properties)
+    result['fields'] = [Collection2._make_field(name, properties)
                         for name, properties in dynamic_fields['fields'].iteritems() if 'dynamicBase' in properties]
-    result['gridlayout_header_fields'] = [Collection._make_gridlayout_header_field({'name': name}, True)
+    result['gridlayout_header_fields'] = [Collection2._make_gridlayout_header_field({'name': name}, True)
                                           for name, properties in dynamic_fields['fields'].iteritems() if 'dynamicBase' in properties]
     result['status'] = 0
   except Exception, e:
@@ -553,8 +552,8 @@ def get_collection(request):
   try:
     name = request.POST['name']
 
-    collection = Collection(name=name, label=name)
-    collection_json = collection.get_c(request.user)
+    collection = Collection2(request.user, name=name)
+    collection_json = collection.get_json(request.user)
 
     result['collection'] = json.loads(collection_json)
     result['status'] = 0