From: John Glover Date: Wed, 21 Mar 2012 15:47:11 +0000 Subject: [forms] bug fix: update groups schema in db_to_form_schema, whitespace clean up. X-Git-Url: https://maxious.lambdacomplex.org/git/?p=ckanext-datagovau.git&a=commitdiff&h=3f3edb3faad17959b1acf8cc0ed7a50ef9039d82 --- [forms] bug fix: update groups schema in db_to_form_schema, whitespace clean up. --- --- a/ckanext/example/forms.py +++ b/ckanext/example/forms.py @@ -1,6 +1,5 @@ import os import logging -from pylons import tmpl_context as c 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 @@ -10,7 +9,7 @@ from ckan.plugins import IDatasetForm, IGroupForm, IConfigurer from ckan.plugins import IGenshiStreamFilter from ckan.plugins import implements, SingletonPlugin -from ckan.lib.navl.validators import ignore_missing, keep_extras +from ckan.lib.navl.validators import ignore_missing, keep_extras, not_empty import ckan.lib.plugins log = logging.getLogger(__name__) @@ -30,15 +29,15 @@ - ``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. + 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 @@ -50,7 +49,7 @@ '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 @@ -76,11 +75,11 @@ 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 + 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 - + return False + def form_to_db_schema(self): """ Returns the schema for mapping group data from a form to a format @@ -94,7 +93,7 @@ format suitable for the form (optional) """ return {} - + def check_data_dict(self, data_dict): """ Check if the return data is correct. @@ -105,8 +104,8 @@ def setup_template_variables(self, context, data_dict): """ Add variables to c just prior to the template being rendered. - """ - + """ + class ExampleDatasetForm(SingletonPlugin, ckan.lib.plugins.DefaultDatasetForm): """This plugin demonstrates how a theme packaged as a CKAN @@ -123,9 +122,9 @@ class will be used. """ implements(IDatasetForm, inherit=True) - implements(IConfigurer, inherit=True) + implements(IConfigurer, inherit=True) implements(IGenshiStreamFilter, inherit=True) - + def update_config(self, config): """ This IConfigurer implementation causes CKAN to look in the @@ -202,7 +201,7 @@ 'composer_tags': [ignore_missing, convert_to_tags(COMPOSER_VOCAB)] }) return schema - + def db_to_form_schema(self): """ Returns the schema for mapping package data from the database into a @@ -220,6 +219,10 @@ convert_from_tags(COMPOSER_VOCAB), ignore_missing ], 'published_by': [convert_from_extras, ignore_missing], + }) + schema['groups'].update({ + 'name': [not_empty, unicode], + 'title': [ignore_missing] }) return schema --- a/ckanext/example/theme/templates/forms/dataset_form.html +++ b/ckanext/example/theme/templates/forms/dataset_form.html @@ -9,7 +9,7 @@

Errors in form

The form contains invalid entries:

@@ -41,9 +42,10 @@
- ${h.url(controller='package', action='search')+'/'}  + ${h.url(controller='package', action='search')+'/'} (edit)

 

+

Warning: URL is very long. Consider changing it to something shorter.

${errors.get('name', '')}
@@ -62,7 +64,7 @@ -
The licence under which the dataset is released.
+
(Don't worry if you don't know which license the data has been released under).
@@ -78,76 +80,51 @@
It is often displayed with the dataset title. In particular, it should start with a short sentence that describes the dataset succinctly, because the first few words alone may be used in some views of the datasets.
--> - - - -
-

Resources: the files and APIs associated with this dataset

- - - - - - - - - -
Resource
- - -
-
    -

  • Add a resource:

    • -
    • -
    • - -
-
-
- -
-

Groups

-
- - - -
- - -
-
- - -
Group
-
- -
-
Cannot add any groups.
-
-

Tags

-
-
+
+ Groups +
+
+
+ + + +
+ + +
+
+ + +
Add to:
+
+ +
+
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.
+
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', '')}
-

Musical Genre

-
-
+
+
@@ -175,8 +151,40 @@
${errors.get('composer_tag_string', '')}
- -
+ + +
+
+

Add resources:

+

Upload or link data files, APIs and other materials related to your dataset.

+
+
+ + + + + + +
+ + + +
+
@@ -198,31 +206,12 @@
A number representing the version (if applicable)
e.g. 1.2.0
-
-
- -
-
-
-
-
- -
-
The organisation credited with or associated with the publication of this data.
- +

Adding custom fields to the dataset such as "location:uk" can help users find it in the search engine. This data will also appear under Additional Information when viewing the dataset.

+
@@ -244,14 +233,31 @@
- - - - -