From 8cf5605e8e8a0c0048f50e5c6f6d8f478c8dbfcd Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Thu, 12 Jun 2014 22:07:34 -0700 Subject: [PATCH] Remove some `edbob` references. --- tailbone/views/auth.py | 4 ++-- tailbone/views/batches/core.py | 1 - tailbone/views/products.py | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tailbone/views/auth.py b/tailbone/views/auth.py index b35d7ca8..de369231 100644 --- a/tailbone/views/auth.py +++ b/tailbone/views/auth.py @@ -92,9 +92,9 @@ def login(request): return HTTPFound(location=referrer, headers=headers) request.session.flash("Invalid username or password") - url = edbob.config.get('edbob.pyramid', 'login.logo_url', + url = request.rattail_config.get('edbob.pyramid', 'login.logo_url', default=request.static_url('edbob.pyramid:static/img/logo.jpg')) - kwargs = eval(edbob.config.get('edbob.pyramid', 'login.logo_kwargs', + kwargs = eval(request.rattail_config.get('edbob.pyramid', 'login.logo_kwargs', default="dict(width=500)")) return {'form': FormRenderer(form), 'referrer': referrer, diff --git a/tailbone/views/batches/core.py b/tailbone/views/batches/core.py index 7b2aab4c..845a76b4 100644 --- a/tailbone/views/batches/core.py +++ b/tailbone/views/batches/core.py @@ -31,7 +31,6 @@ from pyramid.renderers import render_to_response from webhelpers.html import tags -import edbob from edbob.pyramid.forms import PrettyDateTimeFieldRenderer from ...forms import EnumFieldRenderer from ...grids.search import BooleanSearchFilter diff --git a/tailbone/views/products.py b/tailbone/views/products.py index 8f59d879..16878034 100644 --- a/tailbone/views/products.py +++ b/tailbone/views/products.py @@ -386,7 +386,7 @@ class CreateProductsBatch(ProductsGrid): } return render_to_response('/progress.mako', kwargs, request=self.request) - enabled = edbob.config.get('rattail.pyramid', 'batches.providers') + enabled = self.request.rattail_config.get('rattail.pyramid', 'batches.providers') if enabled: enabled = enabled.split()