From: John Glover Date: Tue, 07 Feb 2012 13:23:55 +0000 Subject: [1720][forms, templates] Don't show tags with vocabularies X-Git-Url: https://maxious.lambdacomplex.org/git/?p=ckanext-datagovau.git&a=commitdiff&h=678470980684a0445493047e76e12c1ed311971a --- [1720][forms, templates] Don't show tags with vocabularies in standard 'tags' listing --- --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,4 @@ .#* build/ dist/ - +distribute-* --- a/README.rst +++ b/README.rst @@ -12,6 +12,13 @@ * A custom Pylons controller for overriding some core CKAN behaviour * A custom Package edit form + +* A custom Group edit form + +* A plugin that allows for custom forms to be used for datasets based on + their "type". + +* A custom User registration and edition form * Some simple template customisations @@ -32,17 +39,18 @@ * To understand the nuts and bolts of this file, which is a CKAN *Extension*, read in conjunction with the "Extension - documentation":http://packages.python.org/ckan/plugins.html + documentation": http://docs.ckan.org/en/latest/plugins.html * One thing the extension does is set the values of ``extra_public_paths`` and ``extra_template_paths`` in the CKAN config, which are "documented - here":http://packages.python.org/ckan/configuration.html#extra-template-paths + here": http://docs.ckan.org/en/latest/configuration.html#extra-template-paths * These are set to point at directories within - `ckanext/example/theme/`` (in this package). Here, we override - the home page, provide some extra style with an ``extra.css``, and - customise the navigation and header of the main template in the file ``layout.html``. + ``ckanext/example/theme/`` (in this package). Here we: + * override the home page HTML ``ckanext/example/theme/templates/home/index.html`` + * provide some extra style by serving ``extra.css`` (which is loaded using the ``ckan.template_head_end`` option + * customise the navigation and header of the main template in the file ``layout.html``. The latter file is a great place to make global theme alterations. It uses the _layout template_ pattern "described in the Genshi @@ -50,7 +58,9 @@ This allows you to use Xpath selectors to override snippets of HTML globally. -* The custom package edit form at ``package_form.py`` follows the - conventions in the "main CKAN - documentation":http://packages.python.org/ckan/forms.html +* The custom package edit form at ``package_form.py`` follows a deprecated + way to make a form (using FormAlchemy). This part of the Example Theme needs + updating. In the meantime, follow the instructions at: + http://readthedocs.org/docs/ckan/en/latest/forms.html + --- a/ckanext/example/controller.py +++ b/ckanext/example/controller.py @@ -4,6 +4,8 @@ from ckan.lib.base import model from ckan.lib.base import render from ckan.lib.base import _ + +from ckan.lib.navl.validators import not_empty from ckan.controllers.user import UserController @@ -12,29 +14,40 @@ """This controller is an example to show how you might extend or override core CKAN behaviour from an extension package. - It duplicates functionality in the core CKAN UserController's - register function, but extends it to make an email address - mandatory. + It overrides 2 method hooks which the base class uses to create the + validation schema for the creation and editing of a user; to require + that a fullname is given. """ - def custom_register(self): - if request.method == 'POST': - # custom validation that requires an email address - error = False - c.email = request.params.getone('email') - c.login = request.params.getone('login') - if not model.User.check_name_available(c.login): - error = True - h.flash_error(_("That username is not available.")) - if not c.email: - error = True - h.flash_error(_("You must supply an email address.")) - try: - self._get_form_password() - except ValueError, ve: - h.flash_error(ve) - error = True - if error: - return render('user/register.html') - # now delegate to core CKAN register method - return self.register() + new_user_form = 'user/register.html' + + def _add_requires_full_name_to_schema(self, schema): + """ + Helper function that modifies the fullname validation on an existing schema + """ + schema['fullname'] = [not_empty, unicode] + + def _new_form_to_db_schema(self): + """ + Defines a custom schema that requires a full name to be supplied + + This method is a hook that the base class calls for the validation + schema to use when creating a new user. + """ + schema = super(CustomUserController, self)._new_form_to_db_schema() + self._add_requires_full_name_to_schema(schema) + return schema + + def _edit_form_to_db_schema(self): + """ + Defines a custom schema that requires a full name cannot be removed + when editing the user. + + This method is a hook that the base class calls for the validation + schema to use when editing an exiting user. + """ + schema = super(CustomUserController, self)._edit_form_to_db_schema() + self._add_requires_full_name_to_schema(schema) + return schema + + --- /dev/null +++ b/ckanext/example/forms.py @@ -1,1 +1,224 @@ - +import os, logging +from ckan.authz import Authorizer +from ckan.logic.converters import convert_to_extras,\ + convert_from_extras, convert_to_tags, convert_from_tags, free_tags_only +from ckan.logic.schema import package_form_schema, group_form_schema +from ckan.lib.base import c, model +from ckan.plugins import IDatasetForm, IGroupForm, IConfigurer, IConfigurable +from ckan.plugins import implements, SingletonPlugin +from ckan.lib.navl.validators import ignore_missing, not_empty, keep_extras + +log = logging.getLogger(__name__) + +class ExampleGroupForm(SingletonPlugin): + """This plugin demonstrates how a class packaged as a CKAN + extension might extend CKAN behaviour by providing custom forms + based on the type of a Group. + + In this case, we implement two extension interfaces to provide custom + forms for specific types of group. + + - ``IConfigurer`` allows us to override configuration normally + found in the ``ini``-file. Here we use it to specify where the + form templates can be found. + + - ``IGroupForm`` allows us to provide a custom form for a dataset + based on the 'type' that may be set for a group. Where the + 'type' matches one of the values in group_types then this + class will be used. + """ + implements(IGroupForm, inherit=True) + implements(IConfigurer, inherit=True) + + def update_config(self, config): + """ + This IConfigurer implementation causes CKAN to look in the + ```templates``` directory when looking for the group_form() + """ + here = os.path.dirname(__file__) + rootdir = os.path.dirname(os.path.dirname(here)) + template_dir = os.path.join(rootdir, 'ckanext', + 'example', 'theme', 'templates') + config['extra_template_paths'] = ','.join([template_dir, + config.get('extra_template_paths', '')]) + + def group_form(self): + """ + Returns a string representing the location of the template to be + rendered. e.g. "forms/group_form.html". + """ + return 'forms/group_form.html' + + def group_types(self): + """ + Returns an iterable of group type strings. + + If a request involving a group of one of those types is made, then + this plugin instance will be delegated to. + + There must only be one plugin registered to each group type. Any + attempts to register more than one plugin instance to a given group + type will raise an exception at startup. + """ + return ["testgroup"] + + def is_fallback(self): + """ + Returns true iff this provides the fallback behaviour, when no other + plugin instance matches a group's type. + + As this is not the fallback controller we should return False. If + we were wanting to act as the fallback, we'd return True + """ + return False + + def form_to_db_schema(self): + """ + Returns the schema for mapping group data from a form to a format + suitable for the database. + """ + return group_form_schema() + + def db_to_form_schema(self): + """ + Returns the schema for mapping group data from the database into a + format suitable for the form (optional) + """ + return {} + + def check_data_dict(self, data_dict): + """ + Check if the return data is correct. + + raise a DataError if not. + """ + + def setup_template_variables(self, context, data_dict): + """ + Add variables to c just prior to the template being rendered. + """ + + +class ExampleDatasetForm(SingletonPlugin): + """This plugin demonstrates how a theme packaged as a CKAN + extension might extend CKAN behaviour. + + In this case, we implement three extension interfaces: + + - ``IConfigurer`` allows us to override configuration normally + found in the ``ini``-file. Here we use it to specify where the + form templates can be found. + - ``IDatasetForm`` allows us to provide a custom form for a dataset + based on the type_name that may be set for a package. Where the + type_name matches one of the values in package_types then this + class will be used. + """ + implements(IDatasetForm, inherit=True) + implements(IConfigurer, inherit=True) + implements(IConfigurable) + + def update_config(self, config): + """ + This IConfigurer implementation causes CKAN to look in the + ```templates``` directory when looking for the package_form() + """ + here = os.path.dirname(__file__) + rootdir = os.path.dirname(os.path.dirname(here)) + template_dir = os.path.join(rootdir, 'ckanext', + 'example', 'theme', 'templates') + config['extra_template_paths'] = ','.join([template_dir, + 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) + model.Session.commit() + + def package_form(self): + """ + Returns a string representing the location of the template to be + rendered. e.g. "package/new_package_form.html". + """ + return 'forms/dataset_form.html' + + def is_fallback(self): + """ + Returns true iff this provides the fallback behaviour, when no other + plugin instance matches a package's type. + + As this is not the fallback controller we should return False. If + we were wanting to act as the fallback, we'd return True + """ + return True + + def package_types(self): + """ + Returns an iterable of package type strings. + + If a request involving a package of one of those types is made, then + this plugin instance will be delegated to. + + There must only be one plugin registered to each package type. Any + attempts to register more than one plugin instance to a given package + type will raise an exception at startup. + """ + return ["example_dataset_form"] + + def setup_template_variables(self, context, data_dict=None): + """ + Adds variables to c just prior to the template being rendered that can + then be used within the form + """ + c.licences = [('', '')] + model.Package.get_license_options() + c.publishers = [('Example publisher', 'Example publisher 2')] + c.is_sysadmin = Authorizer().is_sysadmin(c.user) + c.resource_columns = model.Resource.get_columns() + + ## This is messy as auths take domain object not data_dict + pkg = context.get('package') or c.pkg + if pkg: + c.auth_for_change_state = Authorizer().am_authorized( + c, model.Action.CHANGE_STATE, pkg) + + def form_to_db_schema(self): + """ + Returns the schema for mapping package data from a form to a format + suitable for the database. + """ + 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)], + }) + return schema + + def db_to_form_schema(self): + """ + Returns the schema for mapping package data from the database into a + format suitable for the form (optional) + """ + schema = package_form_schema() + schema.update({ + 'tags': { + '__extras': [keep_extras, free_tags_only] + }, + 'vocab_tag_string': [convert_from_tags(self.vocab_name), ignore_missing], + 'published_by': [convert_from_extras, ignore_missing], + }) + return schema + + def check_data_dict(self, data_dict): + """ + Check if the return data is correct and raises a DataError if not. + """ + return + + --- a/ckanext/example/plugin.py +++ b/ckanext/example/plugin.py @@ -21,9 +21,11 @@ found in the ``ini``-file. Here we use it to specify the site title, and to tell CKAN to look in this package for templates and resources that customise the core look and feel. + - ``IGenshiStreamFilter`` allows us to filter and transform the HTML stream just before it is rendered. In this case we use it to rename "frob" to "foobar" + - ``IRoutes`` allows us to add new URLs, or override existing URLs. In this example we use it to override the default ``/register`` behaviour with a custom controller @@ -54,8 +56,11 @@ config.get('extra_public_paths', '')]) config['extra_template_paths'] = ','.join([template_dir, config.get('extra_template_paths', '')]) + # add in the extra.css + config['ckan.template_head_end'] = config.get('ckan.template_head_end', '') +\ + ' ' # set the title - config['ckan.site_title'] = "An example CKAN theme" + config['ckan.site_title'] = "Example CKAN theme" # set the customised package form (see ``setup.py`` for entry point) config['package_form'] = "example_form" @@ -79,14 +84,18 @@ Note that we have also provided a custom register form template at ``theme/templates/user/register.html``. """ - # Note that when we set up the route, we must use the form - # that gives it a name (i.e. in this case, 'register'), so it - # works correctly with the url_for helper:: - # h.url_for('register') - map.connect('register', - '/user/register', + # Hook in our custom user controller at the points of creation + # and edition. + map.connect('/user/register', controller='ckanext.example.controller:CustomUserController', - action='custom_register') + action='register') + map.connect('/user/edit', + controller='ckanext.example.controller:CustomUserController', + action='edit') + map.connect('/user/edit/{id:.*}', + controller='ckanext.example.controller:CustomUserController', + action='edit') + map.connect('/package/new', controller='package_formalchemy', action='new') map.connect('/package/edit/{id}', controller='package_formalchemy', action='edit') return map --- /dev/null +++ b/ckanext/example/theme/templates/forms/dataset_form.html @@ -1,1 +1,251 @@ - +
+ + +
+

Errors in form

+

The form contains invalid entries:

+
    +
  • ${"%s: %s" % (key, error)} + +
      + +
    • + Resource ${idx}: +
        +
      • ${thiskey}: ${errorinfo};
        • +
      +
      • +       +
    +     +
    • +
+
+ +
+
+
+
+ +
+
${errors.get('title', '')}
+ +
+
+ ${url(controller='package', action='index')+'/'}  + +

 

+
+ +
${errors.get('name', '')}
+ +
+
+
The URL for the web page describing the data (not the data itself).
+
e.g. http://www.example.com/growth-figures.html
+
${errors.get('url', '')}
+ +
+
+ +
+
The licence under which the dataset is released.
+ +
+
+
    +
    • +
    • +
+ + + You can use Markdown formatting here. + +
+
+
+ +
+

Resources: the files and APIs associated with this dataset

+ + + + + + + + + +
Resource
+ + +
+
    +

  • Add a resource:

    • +
    • +
    • + +
+
+
+ +
+

Groups

+
+ + + +
+ + +
+
+ + +
Group
+
+ +
+
Cannot add any groups.
+
+

Tags

+
+
+
+ +
+
Comma-separated terms that may link this dataset to similar ones. For more information on conventions, see this wiki page.
+
e.g. pollution, rivers, water quality
+
${errors.get('tag_string', '')}
+
+

Tags with Vocabulary

+
+
+
+ +
+
Similar to standard CKAN tags, but these use a fixed vocabulary.
+
${errors.get('vocab_tag_string', '')}
+
+
+
+
+
+
+
The name of the main contact, for enquiries about this particular dataset, using the e-mail address in the following field.
+ +
+
+ +
+
+
If there is another important contact person (in addition to the person in the Author field) then provide details here.
+ +
+
+ +
+
+
A number representing the version (if applicable)
+
e.g. 1.2.0
+ +
+
+ +
+ +
+
+ +
+
+
+
+ +
+
The organisation credited with or associated with the publication of this data.
+ + + +
+
+ + + Delete +
+ + + +
+
+ + with value + +
+ + +
+
+ + + + + +
+ +

+ Since you have not signed in this will just be your IP address. + Click here to sign in before saving (opens in new window). +

+
+ +
+ + + + +

+ Important: By submitting content, you agree to release your contributions under the Open Database License. Please refrain from editing this page if you are not happy to do this. +

+
+
+ +
+ --- /dev/null +++ b/ckanext/example/theme/templates/forms/group_form.html @@ -1,1 +1,102 @@ +
+
+

Errors in form

+

The form contains invalid entries:

+
    +
  • ${"%s: %s" % (key, error)}
    • +
+
+ +
+
+
+
+ +
+
+ ${g.site_url+h.url_for(controller='group', action='index')+'/'}  + +

 

+
+ +
${errors.get('name', '')}
+ +
+
+
    +
    • +
    • +
+ + + You can use Markdown formatting here. +
+ + +
+
+ +
+
+
+ +
+

Extras

+
+ + +
+
+ + + Delete +
+ + + +
+
+ + with value + +
+ + +
+
+ +
+

Datasets

+
+ +
+
+ +
+ +
+

There are no datasets currently in this group.

+ +

Add datasets

+
+
+
+
+
+ +
+ + + + +
+
+ --- a/ckanext/example/theme/templates/home/index.html +++ b/ckanext/example/theme/templates/home/index.html @@ -22,6 +22,7 @@

Here is the frob

+ ${select("*")} --- a/ckanext/example/theme/templates/layout.html +++ b/ckanext/example/theme/templates/layout.html @@ -9,12 +9,10 @@
-
    -
  • ${h.nav_link(c, _('Home'), controller='home', action='index', id=None)} -
    • -
  • ${h.nav_link(c, _('Data'), controller='package', action='index', id=None)} -
    • -
+ ${h.nav_link(c, _('Home'), controller='home', action='index')} + ${h.nav_link(c, _('Data'), controller='package', action='index')} + ${h.nav_link(c, _('New dataset'), controller='package', action='new')} + ${h.nav_link(c, _('New group'), controller='group', action='new')}
--- a/ckanext/example/theme/templates/user/register.html +++ b/ckanext/example/theme/templates/user/register.html @@ -1,49 +1,50 @@ - - - -
  • -

    Have an OpenID?

    -

    - If you have an account with Google, Yahoo or one of many other - OpenID providers, you can log in without signing up. -

    -
      -
    • ${h.link_to(_('Log in now'), h.url_for(conroller='user', action='login'))}
      • -
    -
    • -     - - Register - User +
    -
    -

    Join the community

    - - -
    - Register with CKAN +
    +

    Errors in form

    +

    The form contains invalid entries:

    +
      +
    • ${"%s: %s" % (key, error)}
      • +
    +
    - - -
    - - -
    - - -
    - - -
    - - -
    -
    - ${h.submit('s', _('Sign up'))} - -
    - - +
    +
    +
    +
    3+ chars, using only 'a-z0-9' and '-_'
    +
    ${errors.get('name', '')}
    +
    +
    +
    ${errors.get('fullname', '')}
    + +
    +
    + +
    +
    +
    ${errors.get('password1', '')}
    + +
    +
    + +
    + + +
    + +
    + + + --- a/setup.py +++ b/setup.py @@ -1,14 +1,12 @@ from setuptools import setup, find_packages -import sys, os -version = '0.1' +version = '0.2' setup( name='ckanext-example', version=version, - description="Example extension for customising CKAN", - long_description="""\ - """, + description='Example extension for customising CKAN', + long_description='', classifiers=[], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers keywords='', author='Seb Bacon', @@ -25,7 +23,9 @@ entry_points=\ """ [ckan.plugins] - example=ckanext.example.plugin:ExamplePlugin + example=ckanext.example.plugin:ExamplePlugin + example_datasetform=ckanext.example.forms:ExampleDatasetForm + example_groupform=ckanext.example.forms:ExampleGroupForm [ckan.forms] example_form = ckanext.example.package_form:get_example_fieldset