Skip to content
Snippets Groups Projects
Commit d07f3bc3 authored by Benjamin Becker's avatar Benjamin Becker
Browse files

refactoring of after_show and before_view

parent 5de910ad
No related branches found
No related tags found
No related merge requests found
......@@ -133,10 +133,7 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm
def dataset_facets(self, facets_dict, package_type):
return OrderedDict({'organization': _('Herausgeber'),
#'res_format': _('Dateiformat'),
'groups': _('Kategorie'),
#'license_title': _('Lizenz'),
#'openness': _('Open-Data-Eigenschaften'),
'subject_text': _('Informationsgegenstand')
})
......@@ -156,19 +153,15 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm
# IPackageController
def after_show(self, context, pkg_dict):
is_follower_name = odsh_helpers.tpsh_get_successor_and_predecessor_dataset(self, context, pkg_dict)
if is_follower_name[0]:
successor_url = helpers.url_for(controller = 'package', action = 'read', id = is_follower_name[0])
else:
successor_url = None
if is_follower_name[1]:
predecessor_url = helpers.url_for(controller = 'package', action = 'read',id = is_follower_name[1])
else:
predecessor_url = None
pkg_dict.update({'successor_url':successor_url})
pkg_dict.update({'predecessor_url':predecessor_url})
pkg_dict = self.before_view(pkg_dict)
'''
adds the following key-value-pairs to pkg_dict
# key: 'is_new', value: True if the dataset has been created within the last month
# key: 'daterange_prettified', value: string with prettified version
of daterange between date_start and date_end
'''
self.__update_successor_and_predecessor_urls_in_pkg_dict(pkg_dict)
self._update_is_new_in_pkg_dict(pkg_dict)
self._update_daterange_prettified_in_pkg_dict(pkg_dict)
return pkg_dict
......@@ -182,15 +175,34 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm
the values are used in the following templates and snippets
# snippet package_item.html
'''
self._update_is_new_in_pkg_dict(pkg_dict)
self._update_daterange_prettified_in_pkg_dict(pkg_dict)
return pkg_dict
@staticmethod
def _update_successor_and_predecessor_urls_in_pkg_dict(pkg_dict):
is_follower_name = odsh_helpers.tpsh_get_successor_and_predecessor_dataset(self, context, pkg_dict)
if is_follower_name[0]:
successor_url = helpers.url_for(controller = 'package', action = 'read', id = is_follower_name[0])
else:
successor_url = None
if is_follower_name[1]:
predecessor_url = helpers.url_for(controller = 'package', action = 'read',id = is_follower_name[1])
else:
predecessor_url = None
pkg_dict.update({'successor_url':successor_url})
pkg_dict.update({'predecessor_url':predecessor_url})
@staticmethod
def _update_is_new_in_pkg_dict(pkg_dict):
is_new = helpers_tpsh.is_package_new(pkg_dict)
pkg_dict.update({'is_new': is_new})
@staticmethod
def _update_daterange_prettified_in_pkg_dict(pkg_dict):
daterange_prettified = helpers_tpsh.get_prettified_daterange(pkg_dict)
pkg_dict.update({'daterange_prettified': daterange_prettified})
return pkg_dict
def before_index(self, dict_pkg):
# make special date fields solr conform
fields = ["issued", "temporal_start", "temporal_end"]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment