diff --git a/fa.extjs b/fa.extjs index 6c04be6..8926366 160000 --- a/fa.extjs +++ b/fa.extjs @@ -1 +1 @@ -Subproject commit 6c04be65e6f4cc84466d4d7e58b4e96bbb1db483 +Subproject commit 89263662c92a32691ac00369145f8d4fefd71d09 diff --git a/fa.jquery b/fa.jquery index f07ad56..0b3b647 160000 --- a/fa.jquery +++ b/fa.jquery @@ -1 +1 @@ -Subproject commit f07ad565057e9a2d847fe88d37bc45e983aa7735 +Subproject commit 0b3b647dfc2e4baf6774a855dae2d282a100bc04 diff --git a/formalchemy b/formalchemy index d1b09ef..1eb3efa 160000 --- a/formalchemy +++ b/formalchemy @@ -1 +1 @@ -Subproject commit d1b09ef7d93d94f1b3dbe54993203a8b3e7976e9 +Subproject commit 1eb3efa5be9c4d9d3f8d74401ad4b49f192a88b0 diff --git a/formalchemy_project/models.py b/formalchemy_project/models.py index 5f5dbcf..437aa5f 100644 --- a/formalchemy_project/models.py +++ b/formalchemy_project/models.py @@ -24,10 +24,10 @@ Base = declarative_base() from fa.jquery.utils import HTML, Color, Slider +from fa.jquery.pyramid import renderers from datetime import datetime from pyramid_formalchemy import actions -from pyramid_formalchemy import renderers from pyramid.i18n import TranslationStringFactory @@ -70,7 +70,7 @@ class User(Base): # the renderer argument will be used for the group relation. You can use a # backref_renderer option to set the renderer of the users relation group_id = Column(Integer, ForeignKey('groups.id'), - renderer=renderers.PyramidAutocompleteFieldRenderer(filter_by='name')) + renderer=renderers.autocomplete_relation(filter_by='name')) group = relation("Group", uselist=False, backref='users') diff --git a/production.ini b/production.ini index 5ffbbef..c8c2d62 100644 --- a/production.ini +++ b/production.ini @@ -1,5 +1,14 @@ +[pipeline:main] +pipeline = + fanstatic + map + +[filter:fanstatic] +use = egg:fanstatic#fanstatic +minified = true +bundle = true -[app:main] +[app:map] use = egg:Paste#urlmap /pyramid_formalchemy = pyramid_formalchemy /formalchemy = formalchemy diff --git a/pyramid_formalchemy b/pyramid_formalchemy index aea94c4..a2ad7e2 160000 --- a/pyramid_formalchemy +++ b/pyramid_formalchemy @@ -1 +1 @@ -Subproject commit aea94c44249aa16d091a6012efb83a4b29d18ebb +Subproject commit a2ad7e2e5e9b41d0322c257c4b8af3ed008cee83