Skip to content

Commit

Permalink
Merge pull request #832 from ckan/832-get-rid-of-formalchemy
Browse files Browse the repository at this point in the history
Get rid of the last remnants of FormAlchemy
  • Loading branch information
seanh committed Nov 6, 2014
2 parents 74db0a4 + e3de200 commit 808bc49
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 388 deletions.
4 changes: 0 additions & 4 deletions ckan/config/routing.py
Expand Up @@ -282,10 +282,6 @@ def make_map():
map.redirect('/groups', '/group')
map.redirect('/groups/{url:.*}', '/group/{url}')

##to get back formalchemy uncomment these lines
##map.connect('/group/new', controller='group_formalchemy', action='new')
##map.connect('/group/edit/{id}', controller='group_formalchemy', action='edit')

# These named routes are used for custom group forms which will use the
# names below based on the group.type ('group' is the default type)
with SubMapper(map, controller='group') as m:
Expand Down
279 changes: 0 additions & 279 deletions ckan/lib/field_types.py

This file was deleted.

15 changes: 0 additions & 15 deletions ckan/logic/converters.py
Expand Up @@ -2,7 +2,6 @@

import ckan.model as model
import ckan.lib.navl.dictization_functions as df
import ckan.lib.field_types as field_types
import ckan.logic.validators as validators

from ckan.common import _
Expand Down Expand Up @@ -46,20 +45,6 @@ def extras_unicode_convert(extras, context):
extras[extra] = unicode(extras[extra])
return extras

def date_to_db(value, context):
try:
value = field_types.DateType.form_to_db(value)
except field_types.DateConvertError, e:
raise df.Invalid(str(e))
return value

def date_to_form(value, context):
try:
value = field_types.DateType.db_to_form(value)
except field_types.DateConvertError, e:
raise df.Invalid(str(e))
return value

def free_tags_only(key, data, errors, context):
tag_number = key[1]
if not data.get(('tags', tag_number, 'vocabulary_id')):
Expand Down

0 comments on commit 808bc49

Please sign in to comment.