rattail/tailbone
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix some bugs with printer profile stuff, per recent rattail changes.

Browse source
This commit is contained in:
Lance Edgar 2014-09-26 15:31:34 -07:00
parent 9d2a35c8b1
commit 350c944e91
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tailbone/templates/labels/profiles/crud.mako
View file

@ -16,7 +16,7 @@
<li>${h.link_to("Back to Label Profiles", url('label_profiles'))}</li> <li>${h.link_to("Back to Label Profiles", url('label_profiles'))}</li>
% if form.updating: % if form.updating:
<% profile = form.fieldset.model %> <% profile = form.fieldset.model %>
<% printer = profile.get_printer() %> <% printer = profile.get_printer(request.rattail_config) %>
% if printer and printer.required_settings: % if printer and printer.required_settings:
<li>${h.link_to("Edit Printer Settings", url('label_profile.printer_settings', uuid=profile.uuid))}</li> <li>${h.link_to("Edit Printer Settings", url('label_profile.printer_settings', uuid=profile.uuid))}</li>
% endif % endif

4
tailbone/templates/labels/profiles/read.mako
View file

@ -5,7 +5,7 @@
<li>${h.link_to("Back to Label Profiles", url('label_profiles'))}</li> <li>${h.link_to("Back to Label Profiles", url('label_profiles'))}</li>
% if form.readonly and request.has_perm('label_profiles.update'): % if form.readonly and request.has_perm('label_profiles.update'):
<% profile = form.fieldset.model %> <% profile = form.fieldset.model %>
<% printer = profile.get_printer() %> <% printer = profile.get_printer(request.rattail_config) %>
<li>${h.link_to("Edit this Label Profile", url('label_profile.update', uuid=form.fieldset.model.uuid))}</li> <li>${h.link_to("Edit this Label Profile", url('label_profile.update', uuid=form.fieldset.model.uuid))}</li>
% if printer and printer.required_settings: % if printer and printer.required_settings:
<li>${h.link_to("Edit Printer Settings", url('label_profile.printer_settings', uuid=profile.uuid))}</li> <li>${h.link_to("Edit Printer Settings", url('label_profile.printer_settings', uuid=profile.uuid))}</li>
@ -16,7 +16,7 @@
${parent.body()} ${parent.body()}
<% profile = form.fieldset.model %> <% profile = form.fieldset.model %>
<% printer = profile.get_printer() %> <% printer = profile.get_printer(request.rattail_config) %>
% if printer and printer.required_settings: % if printer and printer.required_settings:
<h2>Printer Settings</h2> <h2>Printer Settings</h2>

2
tailbone/views/labels.py
View file

@ -141,7 +141,7 @@ def printer_settings(request):
read_profile = HTTPFound(location=request.route_url( read_profile = HTTPFound(location=request.route_url(
'label_profile.read', uuid=profile.uuid)) 'label_profile.read', uuid=profile.uuid))
printer = profile.get_printer() printer = profile.get_printer(request.rattail_config)
if not printer: if not printer:
request.session.flash("Label profile \"%s\" does not have a functional " request.session.flash("Label profile \"%s\" does not have a functional "
"printer spec." % profile) "printer spec." % profile)