diff --git a/pyramid_formalchemy/templates/mytemplate.pt b/pyramid_formalchemy/templates/mytemplate.pt
deleted file mode 100644
index 076856b..0000000
--- a/pyramid_formalchemy/templates/mytemplate.pt
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
The Pyramid Web Application Development Framework
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Welcome to ${project}, an application generated by
- the Pyramid web application development framework.
-
-
-
-
-
-
-
Search documentation
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pyramid_formalchemy/view.zcml b/pyramid_formalchemy/view.zcml
deleted file mode 100644
index f71f2e7..0000000
--- a/pyramid_formalchemy/view.zcml
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pyramid_formalchemy/views.py b/pyramid_formalchemy/views.py
index 5ce1da9..746e35c 100644
--- a/pyramid_formalchemy/views.py
+++ b/pyramid_formalchemy/views.py
@@ -46,11 +46,9 @@ class ModelView(object):
def __init__(self, context, request):
self.context = context
self.request = request
- self.settings = request.registry.settings
- self.model = self.settings['fa.models']
- self.forms = self.settings.get('fa.forms', None)
- self.FieldSet = self.settings.get('fa.fieldset', FieldSet)
- self.Grid = self.settings.get('fa.grid', Grid)
+
+ self.FieldSet = FieldSet
+ self.Grid = Grid
@property
def model_name(self):
@@ -61,22 +59,22 @@ class ModelView(object):
return None
def route_url(self, *args):
- return self.request.route_url('fa_admin', traverse='/'.join([str(a) for a in args]))
+ return self.request.route_url(self.request.route_name, traverse='/'.join([str(a) for a in args]))
def Session(self):
"""return a Session object. You **must** override this."""
- return self.settings['fa.session_factory']()
+ return self.request.session_factory()
def models(self, **kwargs):
"""Models index page"""
request = self.request
models = {}
- if isinstance(self.model, list):
- for model in self.model:
+ if isinstance(request.model, list):
+ for model in request.model:
key = model.__name__
models[key] = self.route_url(key, request.format)
else:
- for key, obj in self.model.__dict__.iteritems():
+ for key, obj in request.model.__dict__.iteritems():
if not key.startswith('_'):
if Document is not None:
try:
@@ -95,32 +93,33 @@ class ModelView(object):
return self.render(models=models)
def get_model(self):
- if isinstance(self.model, list):
- for model in self.model:
+ request = self.request
+ if isinstance(request.model, list):
+ for model in request.model:
if model.__name__ == self.model_name:
return model
- elif hasattr(self.model, self.model_name):
- return getattr(self.model, self.model_name)
+ elif hasattr(request.model, self.model_name):
+ return getattr(request.model, self.model_name)
raise NotFound()
def get_fieldset(self, id):
- if self.forms and hasattr(self.forms, self.model_name):
- fs = getattr(self.forms, self.model_name)
+ if request.forms and hasattr(request.forms, self.model_name):
+ fs = getattr(request.forms, self.model_name)
fs.engine = fs.engine or self.engine
return id and fs.bind(self.get(id)) or fs
raise KeyError(self.model_name)
def get_add_fieldset(self):
- if self.forms and hasattr(self.forms, '%sAdd' % self.model_name):
- fs = getattr(self.forms, '%sAdd' % self.model_name)
+ if request.forms and hasattr(request.forms, '%sAdd' % self.model_name):
+ fs = getattr(request.forms, '%sAdd' % self.model_name)
fs.engine = fs.engine or self.engine
return fs
return self.get_fieldset(id=None)
def get_grid(self):
model_name = self.model_name
- if self.forms and hasattr(self.forms, '%sGrid' % model_name):
- g = getattr(self.forms, '%sGrid' % model_name)
+ if request.forms and hasattr(request.forms, '%sGrid' % model_name):
+ g = getattr(request.forms, '%sGrid' % model_name)
g.engine = g.engine or self.engine
g.readonly = True
self.update_grid(g)
@@ -191,7 +190,7 @@ class ModelView(object):
data = dict(fields=fields)
pk = _pk(fs.model)
if pk:
- data['item_url'] = request.route_url('fa_admin', traverse='%s/json/%s' % (self.model_name, pk))
+ data['item_url'] = self.route_url(self.model_name, 'json', pk)
else:
data = {}
data.update(kwargs)
@@ -265,8 +264,9 @@ class ModelView(object):
fs.engine = fs.engine or self.engine
return fs
"""
- if self.forms and hasattr(self.forms, self.model_name):
- fs = getattr(self.forms, self.model_name)
+ request = self.request
+ if request.forms and hasattr(request.forms, self.model_name):
+ fs = getattr(request.forms, self.model_name)
fs.engine = fs.engine or self.engine
return id and fs.bind(self.get(id)) or fs
fs = self.FieldSet(self.get(id))
@@ -300,9 +300,10 @@ class ModelView(object):
self.update_grid(grid)
return grid
"""
+ request = self.request
model_name = self.model_name
- if self.forms and hasattr(self.forms, '%sGrid' % model_name):
- g = getattr(self.forms, '%sGrid' % model_name)
+ if request.forms and hasattr(request.forms, '%sGrid' % model_name):
+ g = getattr(request.forms, '%sGrid' % model_name)
g.engine = g.engine or self.engine
g.readonly = True
self.update_grid(g)
diff --git a/pyramidapp/pyramidapp/__init__.py b/pyramidapp/pyramidapp/__init__.py
index 6e274d1..c990135 100644
--- a/pyramidapp/pyramidapp/__init__.py
+++ b/pyramidapp/pyramidapp/__init__.py
@@ -3,9 +3,6 @@ from sqlalchemy import engine_from_config
from pyramidapp.models import initialize_sql
-# import
-import pyramid_formalchemy
-
def main(global_config, **settings):
""" This function returns a Pyramid WSGI application.
"""
@@ -17,8 +14,8 @@ def main(global_config, **settings):
view_renderer='templates/mytemplate.pt')
# pyramid_formalchemy's configuration
- pyramid_formalchemy.include(config)
- pyramid_formalchemy.configure(config, package='pyramidapp')
+ config.include('pyramid_formalchemy')
+ config.formalchemy_admin('admin', package='pyramidapp')
return config.make_wsgi_app()
diff --git a/setup.py b/setup.py
index ad2bb72..5ed44a9 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ here = os.path.abspath(os.path.dirname(__file__))
README = open(os.path.join(here, 'README.txt')).read()
CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
-requires = ['pyramid', 'WebError', 'FormAlchemy']
+requires = ['pyramid>=1.0', 'WebError', 'FormAlchemy']
setup(name='pyramid_formalchemy',
version='0.0',