From: Thierry Parmentelat Date: Wed, 13 Mar 2013 10:49:11 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django X-Git-Tag: myslice-django-0.1-1~19 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c134d1d22720a181f26a0ba7219abc8758b575a1;hp=71472094d1731a15d9bf76832ae48ba2a1c0072c;p=unfold.git Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django --- diff --git a/engine/page.py b/engine/page.py index 7ec2727f..850aa7cf 100644 --- a/engine/page.py +++ b/engine/page.py @@ -58,27 +58,32 @@ class Page: def load_metadata(self, request): - manifold_api_session_auth = request.session['manifold']['auth'] - manifold_api = ManifoldAPI(auth=manifold_api_session_auth) + if 'metadata' not in request.session.keys(): + manifold_api_session_auth = request.session['manifold']['auth'] + manifold_api = ManifoldAPI(auth=manifold_api_session_auth) - fields = ['table', 'column.column', + fields = ['table', 'column.column', 'column.description','column.header', 'column.title', 'column.unit', 'column.info_type', 'column.resource_type', 'column.value_type', 'column.allowed_values', 'column.platforms.platform', 'column.platforms.platform_url'] - results = manifold_api.Get('metadata:table', [], [], fields) + results = manifold_api.Get('metadata:table', [], [], fields) - for res in results: - method = res['table'] - self._metadata[method] = res + for res in results: + method = res['table'] + self._metadata[method] = res + + request.session['metadata'] = self._metadata + self._metadata_javascript = "all_headers=" + json.dumps(self._metadata) + ";" + self.add_js_chunks(self._metadata_javascript) + else: + self._metadata = request.session['metadata'] - request.session['metadata'] = self._metadata self._metadata_javascript = "all_headers=" + json.dumps(self._metadata) + ";" self.add_js_chunks(self._metadata_javascript) - def metadata_get_fields(self, method): return self._metadata[method]['column'].sort()