From: John Glover Date: Tue, 21 Feb 2012 11:11:17 +0000 Subject: [forms, commands, templates] Add extended example vocabs and tags to paster command and reintegrate with form X-Git-Url: https://maxious.lambdacomplex.org/git/?p=ckanext-datagovau.git&a=commitdiff&h=93aee32182345141ed6b099efb806cebe8903a69 --- [forms, commands, templates] Add extended example vocabs and tags to paster command and reintegrate with form --- --- a/ckanext/example/commands.py +++ b/ckanext/example/commands.py @@ -13,7 +13,7 @@ Usage:: - paster example create-example-vocab -c + paster example create-example-vocabs -c paster example clean -c - Remove all data created by ckanext-example @@ -34,33 +34,45 @@ cmd = self.args[0] self._load_config() - if cmd == 'create-example-vocab': - self.create_example_vocab() + if cmd == 'create-example-vocabs': + self.create_example_vocabs() else: log.error('Command "%s" not recognized' % (cmd,)) - def create_example_vocab(self): + def create_example_vocabs(self): ''' - Adds an example vocabulary to the database if it doesn't - already exist. + Adds example vocabularies to the database if they don't already exist. ''' user = get_action('get_site_user')({'model': model, 'ignore_auth': True}, {}) context = {'model': model, 'session': model.Session, 'user': user['name']} - data = {'id': forms.EXAMPLE_VOCAB} try: + data = {'id': forms.GENRE_VOCAB} get_action('vocabulary_show')(context, data) - log.info("Example tag vocabulary already exists, skipping.") + log.info("Example genre vocabulary already exists, skipping.") except NotFound: - log.info("Creating example vocab %s" % forms.EXAMPLE_VOCAB) - data = {'name': forms.EXAMPLE_VOCAB} + log.info("Creating vocab %s" % forms.GENRE_VOCAB) + data = {'name': forms.GENRE_VOCAB} vocab = get_action('vocabulary_create')(context, data) - - log.info("Adding tag %s to vocab %s" % ('vocab-tag-example-1', forms.EXAMPLE_VOCAB)) - data = {'name': 'vocab-tag-example-1', 'vocabulary_id': vocab['id']} + log.info("Adding tag %s to vocab %s" % ('jazz', forms.GENRE_VOCAB)) + data = {'name': 'jazz', 'vocabulary_id': vocab['id']} + get_action('tag_create')(context, data) + log.info("Adding tag %s to vocab %s" % ('soul', forms.GENRE_VOCAB)) + data = {'name': 'soul', 'vocabulary_id': vocab['id']} get_action('tag_create')(context, data) - log.info("Adding tag %s to vocab %s" % ('vocab-tag-example-2', forms.EXAMPLE_VOCAB)) - data = {'name': 'vocab-tag-example-2', 'vocabulary_id': vocab['id']} + try: + data = {'id': forms.COMPOSER_VOCAB} + get_action('vocabulary_show')(context, data) + log.info("Example composer vocabulary already exists, skipping.") + except NotFound: + log.info("Creating vocab %s" % forms.COMPOSER_VOCAB) + data = {'name': forms.COMPOSER_VOCAB} + vocab = get_action('vocabulary_create')(context, data) + log.info("Adding tag %s to vocab %s" % ('Bob Mintzer', forms.COMPOSER_VOCAB)) + data = {'name': 'Bob Mintzer', 'vocabulary_id': vocab['id']} + get_action('tag_create')(context, data) + log.info("Adding tag %s to vocab %s" % ('Steve Lewis', forms.COMPOSER_VOCAB)) + data = {'name': 'Steve Lewis', 'vocabulary_id': vocab['id']} get_action('tag_create')(context, data) --- a/ckanext/example/forms.py +++ b/ckanext/example/forms.py @@ -12,7 +12,8 @@ log = logging.getLogger(__name__) -EXAMPLE_VOCAB = u'example_vocab' +GENRE_VOCAB = u'genre_vocab' +COMPOSER_VOCAB = u'composer_vocab' class ExampleGroupForm(SingletonPlugin): @@ -119,7 +120,7 @@ class will be used. """ implements(IDatasetForm, inherit=True) - implements(IConfigurer, inherit=True) + implements(IConfigurer, inherit=True) def update_config(self, config): """ @@ -173,9 +174,11 @@ c.is_sysadmin = Authorizer().is_sysadmin(c.user) c.resource_columns = model.Resource.get_columns() try: - c.vocab_tags = get_action('tag_list')(context, {'vocabulary_id': EXAMPLE_VOCAB}) + c.genre_tags = get_action('tag_list')(context, {'vocabulary_id': GENRE_VOCAB}) + c.composer_tags = get_action('tag_list')(context, {'vocabulary_id': COMPOSER_VOCAB}) except NotFound: c.vocab_tags = None + c.composer_tags = None ## This is messy as auths take domain object not data_dict pkg = context.get('package') or c.pkg @@ -191,7 +194,8 @@ schema = package_form_schema() schema.update({ 'published_by': [ignore_missing, unicode, convert_to_extras], - 'vocab_tags': [ignore_missing, convert_to_tags(EXAMPLE_VOCAB)], + 'genre_tags': [ignore_missing, convert_to_tags(GENRE_VOCAB)], + 'composer_tags': [ignore_missing, convert_to_tags(COMPOSER_VOCAB)] }) return schema @@ -205,7 +209,12 @@ 'tags': { '__extras': [keep_extras, free_tags_only] }, - 'vocab_tags_selected': [convert_from_tags(EXAMPLE_VOCAB), ignore_missing], + 'genre_tags_selected': [ + convert_from_tags(GENRE_VOCAB), ignore_missing + ], + 'composer_tags_selected': [ + convert_from_tags(COMPOSER_VOCAB), ignore_missing + ], 'published_by': [convert_from_extras, ignore_missing], }) return schema @@ -216,4 +225,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 + '
      ' + # for tag in vocab_tags: + # html = html + '
    • %s
      • ' % tag.get('name') + # html = html + "
    • " + # stream = stream | Transformer("//div[@id='sidebar']")\ + # .append(HTML(html)) + # return stream + --- a/ckanext/example/theme/templates/forms/dataset_form.html +++ b/ckanext/example/theme/templates/forms/dataset_form.html @@ -143,22 +143,39 @@
    e.g. pollution, rivers, water quality
    ${errors.get('tag_string', '')}
    -

    Tags With Example Vocabulary

    -
    + +

    Musical Genre

    +
    - + - +
    -
    Similar to standard CKAN tags, but these use a fixed vocabulary.
    -
    ${errors.get('vocab_tag_string', '')}
    -
    +
    ${errors.get('genre_tag_string', '')}
    +
    + +

    Composer

    +
    +
    +
    + +
    +
    ${errors.get('composer_tag_string', '')}
    +
    +