Remove some edbob
references.
This commit is contained in:
parent
59cefd7182
commit
8cf5605e8e
|
@ -92,9 +92,9 @@ def login(request):
|
||||||
return HTTPFound(location=referrer, headers=headers)
|
return HTTPFound(location=referrer, headers=headers)
|
||||||
request.session.flash("Invalid username or password")
|
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'))
|
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)"))
|
default="dict(width=500)"))
|
||||||
|
|
||||||
return {'form': FormRenderer(form), 'referrer': referrer,
|
return {'form': FormRenderer(form), 'referrer': referrer,
|
||||||
|
|
|
@ -31,7 +31,6 @@ from pyramid.renderers import render_to_response
|
||||||
|
|
||||||
from webhelpers.html import tags
|
from webhelpers.html import tags
|
||||||
|
|
||||||
import edbob
|
|
||||||
from edbob.pyramid.forms import PrettyDateTimeFieldRenderer
|
from edbob.pyramid.forms import PrettyDateTimeFieldRenderer
|
||||||
from ...forms import EnumFieldRenderer
|
from ...forms import EnumFieldRenderer
|
||||||
from ...grids.search import BooleanSearchFilter
|
from ...grids.search import BooleanSearchFilter
|
||||||
|
|
|
@ -386,7 +386,7 @@ class CreateProductsBatch(ProductsGrid):
|
||||||
}
|
}
|
||||||
return render_to_response('/progress.mako', kwargs, request=self.request)
|
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:
|
if enabled:
|
||||||
enabled = enabled.split()
|
enabled = enabled.split()
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue