--- a/ckanext/example/forms.py +++ b/ckanext/example/forms.py @@ -1,31 +1,14 @@ import os, logging from ckan.authz import Authorizer -import ckan.logic.action.create as create -import ckan.logic.action.update as update -import ckan.logic.action.get as get -from ckan.logic.converters import date_to_db, date_to_form, convert_to_extras,\ - convert_from_extras, convert_to_tags, convert_from_tags -from ckan.logic import NotFound, NotAuthorized, ValidationError -from ckan.logic import tuplize_dict, clean_dict, parse_params -import ckan.logic.schema as default_schema +from ckan.logic.converters import convert_to_extras,\ + convert_from_extras, convert_to_tags, convert_from_tags, free_tags_only +from ckan.logic import get_action from ckan.logic.schema import package_form_schema, group_form_schema -import ckan.logic.validators as val -from ckan.lib.base import BaseController, render, c, model, abort, request -from ckan.lib.base import redirect, _, config, h -from ckan.lib.package_saver import PackageSaver -from ckan.lib.field_types import DateType, DateConvertError -from ckan.lib.navl.dictization_functions import Invalid -from ckan.lib.navl.dictization_functions import validate, missing -from ckan.lib.navl.dictization_functions import DataError, flatten_dict, unflatten +from ckan.lib.base import c, model from ckan.plugins import IDatasetForm, IGroupForm, IConfigurer, IConfigurable +from ckan.plugins import IGenshiStreamFilter from ckan.plugins import implements, SingletonPlugin - -from ckan.lib.navl.validators import (ignore_missing, - not_empty, - empty, - ignore, - keep_extras, - ) +from ckan.lib.navl.validators import ignore_missing, not_empty, keep_extras log = logging.getLogger(__name__) @@ -135,6 +118,7 @@ implements(IDatasetForm, inherit=True) implements(IConfigurer, inherit=True) implements(IConfigurable) + implements(IGenshiStreamFilter) def update_config(self, config): """ @@ -149,16 +133,37 @@ config.get('extra_template_paths', '')]) def configure(self, config): - """ - Adds our new vocabulary to the database if it doesn't - already exist. - """ - self.vocab_name = u'example_vocab' - v = model.Vocabulary.get(self.vocab_name) - if not v: - log.info("Adding vocab %s" % self.vocab_name) - vocab = model.Vocabulary(self.vocab_name) - model.Session.add(vocab) + ''' + Adds some new vocabularies to the database if they don't already exist. + + ''' + # Add a 'genre' vocabulary with some tags. + self.genre_vocab = model.Vocabulary.get('Genre') + if not self.genre_vocab: + log.info("Adding vocab Genre") + self.genre_vocab = model.Vocabulary('Genre') + model.Session.add(self.genre_vocab) + model.Session.commit() + log.info("Adding example tags to vocab %s" % self.genre_vocab.name) + jazz_tag = model.Tag('jazz', self.genre_vocab.id) + soul_tag = model.Tag('soul', self.genre_vocab.id) + model.Session.add(jazz_tag) + model.Session.add(soul_tag) + model.Session.commit() + + # Add a 'composer' vocabulary with some tags. + self.composer_vocab = model.Vocabulary.get('Composer') + if not self.composer_vocab: + log.info("Adding vocab Composer") + self.composer_vocab = model.Vocabulary('Composer') + model.Session.add(self.composer_vocab) + model.Session.commit() + log.info("Adding example tags to vocab %s" % + self.composer_vocab.name) + mintzer_tag = model.Tag('Bob Mintzer', self.composer_vocab.id) + lewis_tag = model.Tag('Steve Lewis', self.composer_vocab.id) + model.Session.add(mintzer_tag) + model.Session.add(lewis_tag) model.Session.commit() def package_form(self): @@ -200,6 +205,8 @@ c.publishers = [('Example publisher', 'Example publisher 2')] c.is_sysadmin = Authorizer().is_sysadmin(c.user) c.resource_columns = model.Resource.get_columns() + c.genre_tags = get_action('tag_list')(context, {'vocabulary_id': self.genre_vocab.name}) + c.composer_tags = get_action('tag_list')(context, {'vocabulary_id': self.composer_vocab.name}) ## This is messy as auths take domain object not data_dict pkg = context.get('package') or c.pkg @@ -215,7 +222,8 @@ schema = package_form_schema() schema.update({ 'published_by': [not_empty, unicode, convert_to_extras], - 'vocab_tag_string': [ignore_missing, convert_to_tags(self.vocab_name)], + 'genre_tags': [ignore_missing, convert_to_tags(self.genre_vocab.name)], + 'composer_tags': [ignore_missing, convert_to_tags(self.composer_vocab.name)], }) return schema @@ -227,9 +235,12 @@ schema = package_form_schema() schema.update({ 'tags': { - '__extras': [keep_extras] + '__extras': [keep_extras, free_tags_only] }, - 'vocab_tag_string': [convert_from_tags(self.vocab_name), ignore_missing], + 'genre_tags_selected': [convert_from_tags(self.genre_vocab.name), + ignore_missing], + 'composer_tags_selected': [ + convert_from_tags(self.composer_vocab.name), ignore_missing], 'published_by': [convert_from_extras, ignore_missing], }) return schema @@ -240,4 +251,26 @@ """ return - + def filter(self, stream): + # Add vocab tags to the bottom of the sidebar. + from pylons import request + from genshi.filters import Transformer + from genshi.input import HTML + routes = request.environ.get('pylons.routes_dict') + if routes.get('controller') == 'package' \ + and routes.get('action') == 'read': + for vocab in (self.genre_vocab, self.composer_vocab): + vocab_tags = [tag for tag in c.pkg_dict.get('tags', []) + if tag.get('vocabulary_id') == vocab.id] + if not vocab_tags: + continue + html = '
  • ' + html = html + '

    %s

    ' % vocab.name + html = html + '
    • " + stream = stream | Transformer("//div[@id='sidebar']")\ + .append(HTML(html)) + return stream +