[open-ils-commits] SPAM: r8762 - in
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb:
controllers controllers/acq lib lib/acq templates/oils
templates/oils/default templates/oils/default/acq
templates/oils/default/acq/financial
templates/oils/default/acq/picklist
templates/oils/default/admin templates/oils/default/common
svn at svn.open-ils.org
svn at svn.open-ils.org
Mon Feb 18 12:25:19 EST 2008
Author: erickson
Date: 2008-02-18 11:55:07 -0500 (Mon, 18 Feb 2008)
New Revision: 8762
Modified:
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/__init__.py
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/fund.py
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/fund_source.py
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/picklist.py
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/provider.py
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/admin.py
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/base.py
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/acq/fund.py
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/acq/picklist.py
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/acq/search.py
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/context.py
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/request.py
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/user.py
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund_allocation.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund_source.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_funding_source_credit.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_provider.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_fund_sources.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funds.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund_source.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_provider.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/navigate.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/create.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/navigate.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/picklist_entry_summary.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/picklist_summary.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/search.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_entry.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_list.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/admin/navigate.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/admin/object.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/common/widgets.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/footer.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/header.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/navigate.html
Log:
ContextItem()'s now retain the full object with a new .value attribute for storing the value
There is no longer the underscore postfix variable notation for storing the contextobject
Got rid of the Util context in favor of direct module imports in the templates (less indirection)
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/__init__.py
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/__init__.py 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/__init__.py 2008-02-18 16:55:07 UTC (rev 8762)
@@ -79,7 +79,7 @@
self.picklist_entry_marc_html = ContextItem()
def postinit(self):
- self.prefix = "%s/acq" % Context.get_context().core.prefix
+ self.prefix.value = "%s/acq" % Context.get_context().core.prefix.value
Context.apply_sub_context('acq', AcqContext)
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/fund.py
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/fund.py 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/fund.py 2008-02-18 16:55:07 UTC (rev 8762)
@@ -14,7 +14,7 @@
def _retrieve_fund(self, r, ses, fund_id):
''' Retrieves a fund object with summary and fleshse the org field '''
fund = ses.request('open-ils.acq.fund.retrieve',
- r.ctx.core.authtoken, fund_id, {"flesh_summary":1}).recv().content()
+ r.ctx.core.authtoken.value, fund_id, {"flesh_summary":1}).recv().content()
Event.parse_and_raise(fund)
fund.org(OrgUtil.get_org_unit(fund.org())) # flesh the org
return fund
@@ -22,17 +22,19 @@
def view(self, **kwargs):
r = RequestMgr()
- r.ctx.core.org_tree = OrgUtil.fetch_org_tree()
+ r.ctx.core.org_tree.value = OrgUtil.fetch_org_tree()
fund_id = kwargs['id']
ses = ClientSession(oils.const.OILS_APP_ACQ)
fund = ses.request('open-ils.acq.fund.retrieve',
- r.ctx.core.authtoken, fund_id,
+ r.ctx.core.authtoken.value, fund_id,
{"flesh_summary":1, 'flesh_allocations':1, 'flesh_allocation_sources':1}).recv().content()
Event.parse_and_raise(fund)
- fund.org(OrgUtil.get_org_unit(fund.org())) # flesh the org
- r.ctx.acq.fund = fund
+ org_unit = OrgUtil.get_org_unit(fund.org())
+ fund.org(org_unit)
+
+ r.ctx.acq.fund.value = fund
return r.render('acq/financial/view_fund.html')
def list(self):
@@ -40,11 +42,11 @@
ses = ClientSession(oils.const.OILS_APP_ACQ)
funds = ses.request(
'open-ils.acq.fund.org.retrieve',
- r.ctx.core.authtoken, None, {"flesh_summary":1}).recv().content()
+ r.ctx.core.authtoken.value, None, {"flesh_summary":1}).recv().content()
Event.parse_and_raise(funds)
for f in funds:
f.org(OrgUtil.get_org_unit(f.org()))
- r.ctx.acq.fund_list = funds
+ r.ctx.acq.fund_list.value = funds
return r.render('acq/financial/list_funds.html')
@@ -52,16 +54,16 @@
r = RequestMgr()
ses = ClientSession(oils.const.OILS_APP_ACQ)
- if r.ctx.acq.fund_name: # create then display the fund
+ if r.ctx.acq.fund_name.value: # create then display the fund
fund = osrf.net_obj.NetworkObject.acqf()
- fund.name(r.ctx.acq.fund_name)
- fund.org(r.ctx.acq.fund_org)
- fund.year(r.ctx.acq.fund_year)
- fund.currency_type(r.ctx.acq.fund_currency_type)
+ fund.name(r.ctx.acq.fund_name.value)
+ fund.org(r.ctx.acq.fund_org.value)
+ fund.year(r.ctx.acq.fund_year.value)
+ fund.currency_type(r.ctx.acq.fund_currency_type.value)
fund_id = ses.request('open-ils.acq.fund.create',
- r.ctx.core.authtoken, fund).recv().content()
+ r.ctx.core.authtoken.value, fund).recv().content()
Event.parse_and_raise(fund_id)
return redirect_to(controller='acq/fund', action='view', id=fund_id)
@@ -71,8 +73,8 @@
types = ses.request(
'open-ils.acq.currency_type.all.retrieve',
- r.ctx.core.authtoken).recv().content()
- r.ctx.acq.currency_types = Event.parse_and_raise(types)
+ r.ctx.core.authtoken.value).recv().content()
+ r.ctx.acq.currency_types.value = Event.parse_and_raise(types)
if tree is None:
@@ -84,38 +86,38 @@
r = RequestMgr()
ses = ClientSession(oils.const.OILS_APP_ACQ)
- if r.ctx.acq.fund_allocation_source:
+ if r.ctx.acq.fund_allocation_source.value:
return self._allocate(r, ses)
- fund = self._retrieve_fund(r, ses, r.ctx.acq.fund_id)
+ fund = self._retrieve_fund(r, ses, r.ctx.acq.fund_id.value)
source_list = ses.request(
'open-ils.acq.funding_source.org.retrieve',
- r.ctx.core.authtoken, None, {'limit_perm':'MANAGE_FUNDING_SOURCE', 'flesh_summary':1}).recv().content()
+ r.ctx.core.authtoken.value, None, {'limit_perm':'MANAGE_FUNDING_SOURCE', 'flesh_summary':1}).recv().content()
Event.parse_and_raise(source_list)
- r.ctx.acq.fund = fund
- r.ctx.acq.fund_source_list = source_list
+ r.ctx.acq.fund.value = fund
+ r.ctx.acq.fund_source_list.value = source_list
return r.render('acq/financial/create_fund_allocation.html')
def _allocate(self, r, ses):
''' Create a new fund_allocation '''
alloc = osrf.net_obj.NetworkObject.acqfa()
- alloc.funding_source(r.ctx.acq.fund_allocation_source)
- alloc.fund(r.ctx.acq.fund_allocation_fund)
+ alloc.funding_source(r.ctx.acq.fund_allocation_source.value)
+ alloc.fund(r.ctx.acq.fund_allocation_fund.value)
- if r.ctx.acq.fund_allocation_amount:
- alloc.amount(r.ctx.acq.fund_allocation_amount)
+ if r.ctx.acq.fund_allocation_amount.value:
+ alloc.amount(r.ctx.acq.fund_allocation_amount.value)
else:
- alloc.percent(r.ctx.acq.fund_allocation_percent)
- alloc.note(r.ctx.acq.fund_allocation_note)
+ alloc.percent(r.ctx.acq.fund_allocation_percent.value)
+ alloc.note(r.ctx.acq.fund_allocation_note.value)
alloc_id = ses.request(
- 'open-ils.acq.fund_allocation.create', r.ctx.core.authtoken, alloc).recv().content()
+ 'open-ils.acq.fund_allocation.create', r.ctx.core.authtoken.value, alloc).recv().content()
Event.parse_and_raise(alloc_id)
- return redirect_to(controller='acq/fund', action='view', id=r.ctx.acq.fund_allocation_fund)
+ return redirect_to(controller='acq/fund', action='view', id=r.ctx.acq.fund_allocation_fund.value)
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/fund_source.py
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/fund_source.py 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/fund_source.py 2008-02-18 16:55:07 UTC (rev 8762)
@@ -14,15 +14,15 @@
def view(self, **kwargs):
r = RequestMgr()
ses = ClientSession(oils.const.OILS_APP_ACQ)
- r.ctx.core.org_tree = OrgUtil.fetch_org_tree()
+ r.ctx.core.org_tree.value = OrgUtil.fetch_org_tree()
source = ses.request(
'open-ils.acq.funding_source.retrieve',
- r.ctx.core.authtoken, kwargs.get('id'), {"flesh_summary":1}).recv().content()
+ r.ctx.core.authtoken.value, kwargs.get('id'), {"flesh_summary":1}).recv().content()
Event.parse_and_raise(source)
source.owner(OrgUtil.get_org_unit(source.owner())) # flesh the owner
- r.ctx.acq.fund_source = source
+ r.ctx.acq.fund_source.value = source
return r.render('acq/financial/view_fund_source.html')
def list(self):
@@ -31,10 +31,10 @@
sources = ses.request(
'open-ils.acq.funding_source.org.retrieve',
- r.ctx.core.authtoken, None, {"flesh_summary":1}).recv().content()
+ r.ctx.core.authtoken.value, None, {"flesh_summary":1}).recv().content()
Event.parse_and_raise(sources)
- r.ctx.acq.fund_source_list = sources
+ r.ctx.acq.fund_source_list.value = sources
for source in sources:
source.owner(OrgUtil.get_org_unit(source.owner()))
@@ -45,25 +45,25 @@
r = RequestMgr()
fund_mgr = oilsweb.lib.acq.fund.FundMgr(r)
- if r.ctx.acq.fund_source_name:
+ if r.ctx.acq.fund_source_name.value:
source = osrf.net_obj.NetworkObject.acqfs()
- source.name(r.ctx.acq.fund_source_name)
- source.owner(r.ctx.acq.fund_source_owner)
- source.currency_type(r.ctx.acq.fund_source_currency_type)
+ source.name(r.ctx.acq.fund_source_name.value)
+ source.owner(r.ctx.acq.fund_source_owner.value)
+ source.currency_type(r.ctx.acq.fund_source_currency_type.value)
source_id = fund_mgr.create_fund_source(source)
return redirect_to(controller='acq/fund_source', action='view', id=source_id)
perm_orgs = ClientSession.atomic_request(
'open-ils.actor',
'open-ils.actor.user.work_perm.highest_org_set',
- r.ctx.core.authtoken, 'CREATE_FUNDING_SOURCE');
+ r.ctx.core.authtoken.value, 'CREATE_FUNDING_SOURCE');
if len(perm_orgs) == 0:
return _("Insufficient Permissions") # XXX Return a perm failure template
- r.ctx.core.perm_tree['CREATE_FUNDING_SOURCE'] = OrgUtil.get_union_tree(perm_orgs)
- r.ctx.core.high_perm_orgs['CREATE_FUNDING_SOURCE'] = perm_orgs
- r.ctx.acq.currency_types = fund_mgr.fetch_currency_types()
+ r.ctx.core.perm_tree.value['CREATE_FUNDING_SOURCE'] = OrgUtil.get_union_tree(perm_orgs)
+ r.ctx.core.high_perm_orgs.value['CREATE_FUNDING_SOURCE'] = perm_orgs
+ r.ctx.acq.currency_types.value = fund_mgr.fetch_currency_types()
return r.render('acq/financial/create_fund_source.html')
@@ -71,22 +71,22 @@
r = RequestMgr()
ses = ClientSession(oils.const.OILS_APP_ACQ)
- if r.ctx.acq.fund_source_credit_amount:
+ if r.ctx.acq.fund_source_credit_amount.value:
credit = osrf.net_obj.NetworkObject.acqfscred()
- credit.funding_source(r.ctx.acq.fund_source_id)
- credit.amount(r.ctx.acq.fund_source_credit_amount)
- credit.note(r.ctx.acq.fund_source_credit_note)
+ credit.funding_source(r.ctx.acq.fund_source_id.value)
+ credit.amount(r.ctx.acq.fund_source_credit_amount.value)
+ credit.note(r.ctx.acq.fund_source_credit_note.value)
status = ses.request(
'open-ils.acq.funding_source_credit.create',
- r.ctx.core.authtoken, credit).recv().content()
+ r.ctx.core.authtoken.value, credit).recv().content()
status = Event.parse_and_raise(status)
- return redirect_to(controller='acq/fund_source', action='view', id=r.ctx.acq.fund_source_id)
+ return redirect_to(controller='acq/fund_source', action='view', id=r.ctx.acq.fund_source_id.value)
source = ses.request('open-ils.acq.funding_source.retrieve',
- r.ctx.core.authtoken, r.ctx.acq.fund_source_id, {"flesh_summary":1}).recv().content()
- r.ctx.acq.fund_source = Event.parse_and_raise(source)
+ r.ctx.core.authtoken.value, r.ctx.acq.fund_source_id.value, {"flesh_summary":1}).recv().content()
+ r.ctx.acq.fund_source.value = Event.parse_and_raise(source)
source.owner(OrgUtil.get_org_unit(source.owner()))
return r.render('acq/financial/create_funding_source_credit.html')
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/picklist.py
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/picklist.py 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/picklist.py 2008-02-18 16:55:07 UTC (rev 8762)
@@ -17,20 +17,20 @@
r = RequestMgr()
pl_manager = oilsweb.lib.acq.picklist.PicklistMgr(r, picklist_id=kwargs['id'])
pl_manager.retrieve()
- pl_manager.retrieve_entries(flesh_provider=True, offset=r.ctx.acq.offset, limit=r.ctx.acq.limit)
- r.ctx.acq.picklist = pl_manager.picklist
- r.ctx.acq.picklist_list = pl_manager.retrieve_list()
+ pl_manager.retrieve_entries(flesh_provider=True, offset=r.ctx.acq.offset.value, limit=r.ctx.acq.limit.value)
+ r.ctx.acq.picklist.value = pl_manager.picklist
+ r.ctx.acq.picklist_list.value = pl_manager.retrieve_list()
return r.render('acq/picklist/view.html')
def create(self, **kwargs):
r = RequestMgr()
- if r.ctx.acq.picklist_name:
+ if r.ctx.acq.picklist_name.value:
picklist = osrf.net_obj.NetworkObject.acqpl()
- picklist.name(r.ctx.acq.picklist_name)
- picklist.owner(r.ctx.core.user.id())
+ picklist.name(r.ctx.acq.picklist_name.value)
+ picklist.owner(r.ctx.core.user.value.id())
picklist_id = ClientSession.atomic_request(
oils.const.OILS_APP_ACQ,
- 'open-ils.acq.picklist.create', r.ctx.core.authtoken, picklist)
+ 'open-ils.acq.picklist.create', r.ctx.core.authtoken.value, picklist)
Event.parse_and_raise(picklist_id)
return redirect_to(controller='acq/picklist', action='view', id=picklist_id)
return r.render('acq/picklist/create.html')
@@ -41,30 +41,30 @@
entry = pl_manager.retrieve_entry(kwargs.get('id'), flesh=1, flesh_provider=True)
pl_manager.id = entry.picklist()
picklist = pl_manager.retrieve()
- r.ctx.acq.picklist = pl_manager.picklist
- r.ctx.acq.picklist_entry = entry
- r.ctx.acq.picklist_entry_marc_html = oilsweb.lib.bib.marc_to_html(entry.marc())
+ r.ctx.acq.picklist.value = pl_manager.picklist
+ r.ctx.acq.picklist_entry.value = entry
+ r.ctx.acq.picklist_entry_marc_html.value = oilsweb.lib.bib.marc_to_html(entry.marc())
return r.render('acq/picklist/view_entry.html')
def list(self):
r = RequestMgr()
pl_manager = oilsweb.lib.acq.picklist.PicklistMgr(r)
- r.ctx.acq.picklist_list = pl_manager.retrieve_list()
+ r.ctx.acq.picklist_list.value = pl_manager.retrieve_list()
return r.render('acq/picklist/view_list.html')
def search(self):
r = RequestMgr()
- r.ctx.acq.z39_sources = oilsweb.lib.acq.search.fetch_z39_sources(r.ctx)
+ r.ctx.acq.z39_sources.value = oilsweb.lib.acq.search.fetch_z39_sources(r.ctx)
sc = {}
- for data in r.ctx.acq.z39_sources.values():
+ for data in r.ctx.acq.z39_sources.value.values():
for key, val in data['attrs'].iteritems():
sc[key] = val.get('label') or key
- r.ctx.acq.search_classes = sc
+ r.ctx.acq.search_classes.value = sc
keys = sc.keys()
keys.sort()
- r.ctx.acq.search_classes_sorted = keys
+ r.ctx.acq.search_classes_sorted.value = keys
return r.render('acq/picklist/search.html')
@@ -95,7 +95,7 @@
ses.connect()
page = None
- if r.ctx.acq.picklist_action == 'move_selected':
+ if r.ctx.acq.picklist_action.value == 'move_selected':
page = self._move_selected(r, ses)
if not page:
@@ -106,20 +106,20 @@
def _move_selected(self, r, ses):
''' Moves the selected picklist entry's to the destination picklist '''
- for entry_id in r.ctx.acq.picklist_entry_id_list:
+ for entry_id in r.ctx.acq.picklist_entry_id_list.value:
entry = ses.request(
'open-ils.acq.picklist_entry.retrieve',
- r.ctx.core.authtoken, entry_id).recv().content()
+ r.ctx.core.authtoken.value, entry_id).recv().content()
entry = Event.parse_and_raise(entry)
- entry.picklist(r.ctx.acq.picklist_dest_id)
+ entry.picklist(r.ctx.acq.picklist_dest_id.value)
status = ses.request(
'open-ils.acq.picklist_entry.update',
- r.ctx.core.authtoken, entry).recv().content()
+ r.ctx.core.authtoken.value, entry).recv().content()
Event.parse_and_raise(status)
- return redirect_to(controller='acq/picklist', action='view', id=r.ctx.acq.picklist_dest_id)
+ return redirect_to(controller='acq/picklist', action='view', id=r.ctx.acq.picklist_dest_id.value)
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/provider.py
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/provider.py 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/provider.py 2008-02-18 16:55:07 UTC (rev 8762)
@@ -14,10 +14,10 @@
r = RequestMgr()
ses = ClientSession(oils.const.OILS_APP_ACQ)
provider = ses.request('open-ils.acq.provider.retrieve',
- r.ctx.core.authtoken, kwargs.get('id')).recv().content()
+ r.ctx.core.authtoken.value, kwargs.get('id')).recv().content()
Event.parse_and_raise(provider)
provider.owner(OrgUtil.get_org_unit(provider.owner()))
- r.ctx.acq.provider = provider
+ r.ctx.acq.provider.value = provider
return r.render('acq/financial/view_provider.html')
@@ -25,15 +25,15 @@
r = RequestMgr()
ses = ClientSession(oils.const.OILS_APP_ACQ)
- if r.ctx.acq.provider_name: # create then display the provider
+ if r.ctx.acq.provider_name.value: # create then display the provider
provider = NetworkObject.acqpro()
- provider.name(r.ctx.acq.provider_name)
- provider.owner(r.ctx.acq.provider_owner)
- provider.currency_type(r.ctx.acq.provider_currency_type)
+ provider.name(r.ctx.acq.provider_name.value)
+ provider.owner(r.ctx.acq.provider_owner.value)
+ provider.currency_type(r.ctx.acq.provider_currency_type.value)
provider_id = ses.request('open-ils.acq.provider.create',
- r.ctx.core.authtoken, provider).recv().content()
+ r.ctx.core.authtoken.value, provider).recv().content()
Event.parse_and_raise(provider_id)
return redirect_to(controller='acq/provider', action='view', id=provider_id)
@@ -43,8 +43,8 @@
types = ses.request(
'open-ils.acq.currency_type.all.retrieve',
- r.ctx.core.authtoken).recv().content()
- r.ctx.acq.currency_types = Event.parse_and_raise(types)
+ r.ctx.core.authtoken.value).recv().content()
+ r.ctx.acq.currency_types.value = Event.parse_and_raise(types)
if tree is None:
@@ -57,10 +57,10 @@
ses = ClientSession(oils.const.OILS_APP_ACQ)
providers = ses.request(
'open-ils.acq.provider.org.retrieve',
- r.ctx.core.authtoken, None, {"flesh_summary":1}).recv().content()
+ r.ctx.core.authtoken.value, None, {"flesh_summary":1}).recv().content()
Event.parse_and_raise(providers)
for f in providers:
f.owner(OrgUtil.get_org_unit(f.owner()))
- r.ctx.acq.provider_list = providers
+ r.ctx.acq.provider_list.value = providers
return r.render('acq/financial/list_providers.html')
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/admin.py
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/admin.py 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/admin.py 2008-02-18 16:55:07 UTC (rev 8762)
@@ -15,7 +15,7 @@
self.mode = ContextItem(default_value='view')
self.prefix = ContextItem()
def postinit(self):
- self.prefix = "%s/admin" % Context.get_context().core.prefix
+ self.prefix.value = "%s/admin" % Context.get_context().core.prefix.value
Context.apply_sub_context('adm', AdminContext)
@@ -23,11 +23,11 @@
def init(self, obj_type, obj_id=None):
r = RequestMgr()
- r.ctx.adm.object_class = obj_type
- meta = r.ctx.adm.object_meta = oils.utils.idl.IDLParser.get_class(obj_type)
+ r.ctx.adm.object_class.value = obj_type
+ meta = r.ctx.adm.object_meta.value = oils.utils.idl.IDLParser.get_class(obj_type)
if obj_id is not None:
- r.ctx.adm.object = osrf.ses.ClientSession.atomic_request(
+ r.ctx.adm.object.value = osrf.ses.ClientSession.atomic_request(
'open-ils.cstore',
'open-ils.cstore.direct.%s.retrieve' %
meta.fieldmapper.replace('::', '.'), obj_id)
@@ -39,22 +39,22 @@
def view(self, **kwargs):
r = self.init(kwargs['type'], kwargs['id'])
- r.ctx.adm.mode = 'view'
+ r.ctx.adm.mode.value = 'view'
return r.render('admin/object.html')
def update(self, **kwargs):
r = self.init(kwargs['type'], kwargs['id'])
- r.ctx.adm.mode = 'update'
+ r.ctx.adm.mode.value = 'update'
return r.render('admin/object.html')
def create(self, **kwargs):
r = self.init(kwargs['type'])
- r.ctx.adm.mode = 'create'
+ r.ctx.adm.mode.value = 'create'
return r.render('admin/object.html')
def delete(self, **kwargs):
r = self.init(kwargs['type'], kwargs['id'])
- r.ctx.adm.mode = 'delete'
+ r.ctx.adm.mode.value = 'delete'
return r.render('admin/object.html')
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/base.py
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/base.py 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/base.py 2008-02-18 16:55:07 UTC (rev 8762)
@@ -9,7 +9,7 @@
class BaseContext(SubContext):
def postinit(self):
- self.prefix = "%s/base" % Context.get_context().core.prefix
+ self.prefixvalue = "%s/base" % Context.get_context().core.prefix.value
Context.apply_sub_context('base', BaseContext)
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py 2008-02-18 16:55:07 UTC (rev 8762)
@@ -28,26 +28,13 @@
self.perm_tree = ContextItem(default_value={})
def postinit(self):
- self.prefix = pylons.config['oils_prefix']
- self.media_prefix = pylons.config['oils_media_prefix']
- self.ac_prefix = pylons.config['oils_added_content_prefix']
- self.skin = 'default' # XXX
- self.theme = 'default' # XXX
+ self.prefix.value = pylons.config['oils_prefix']
+ self.media_prefix.value = pylons.config['oils_media_prefix']
+ self.ac_prefix.value = pylons.config['oils_added_content_prefix']
+ self.skin.value = 'default' # XXX
+ self.theme.value = 'default' # XXX
usermgr = oilsweb.lib.user.User(self)
usermgr.fetch_user()
#self.work_orgs = usermgr.fetch_work_orgs()
Context.apply_sub_context('core', CoreContext)
-
-
-class UtilContext(SubContext):
- ''' The UtilContext maintains a set of general use functions '''
- def __init__(self):
- import oilsweb.lib.bib
- self.scrub_isbn = ContextItem(default_value=oilsweb.lib.bib.scrub_isbn)
- self.get_org_type = ContextItem(default_value=oils.org.OrgUtil.get_org_type)
- self.get_min_org_depth = ContextItem(default_value=oils.org.OrgUtil.get_min_depth)
-
-Context.apply_sub_context('util', UtilContext)
-
-
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/acq/fund.py
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/acq/fund.py 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/acq/fund.py 2008-02-18 16:55:07 UTC (rev 8762)
@@ -10,28 +10,28 @@
def fetch_currency_types(self):
types = self.ses.request(
'open-ils.acq.currency_type.all.retrieve',
- self.request_mgr.ctx.core.authtoken).recv().content()
+ self.request_mgr.ctx.core.authtoken.value).recv().content()
oils.event.Event.parse_and_raise(types)
return types
def retrieve(self, fund_id):
fund = self.ses.request(
'open-ils.acq.fund.retrieve',
- self.request_mgr.ctx.core.authtoken, fund_id).recv().content()
+ self.request_mgr.ctx.core.authtoken.value, fund_id).recv().content()
oils.event.Event.parse_and_raise(fund)
return fund
def retrieve_org_funds(self, limit_perm=None):
funds = self.ses.request(
'open-ils.acq.fund.org.retrieve',
- self.request_mgr.ctx.core.authtoken, None, limit_perm).recv().content()
+ self.request_mgr.ctx.core.authtoken.value, None, limit_perm).recv().content()
oils.event.Event.parse_and_raise(funds)
return funds
def create_fund(self, fund):
fund_id = self.ses.request(
'open-ils.acq.fund.create',
- self.request_mgr.ctx.core.authtoken, fund).recv().content()
+ self.request_mgr.ctx.core.authtoken.value, fund).recv().content()
oils.event.Event.parse_and_raise(fund_id)
return fund_id
@@ -39,14 +39,14 @@
def retrieve_fund_source(self, source_id):
source = self.ses.request(
'open-ils.acq.funding_source.retrieve',
- self.request_mgr.ctx.core.authtoken, source_id).recv().content()
+ self.request_mgr.ctx.core.authtoken.value, source_id).recv().content()
oils.event.Event.parse_and_raise(source)
return source
def retrieve_org_fund_sources(self, options=None):
sources = self.ses.request(
'open-ils.acq.funding_source.org.retrieve',
- self.request_mgr.ctx.core.authtoken, None, options).recv().content()
+ self.request_mgr.ctx.core.authtoken.value, None, options).recv().content()
oils.event.Event.parse_and_raise(sources)
return sources
@@ -54,14 +54,14 @@
def create_fund_source(self, source):
source_id = self.ses.request(
'open-ils.acq.funding_source.create',
- self.request_mgr.ctx.core.authtoken, source).recv().content()
+ self.request_mgr.ctx.core.authtoken.value, source).recv().content()
oils.event.Event.parse_and_raise(source_id)
return source_id
def create_allocation(self, alloc):
alloc_id = self.ses.request(
'open-ils.acq.fund_allocation.create',
- self.request_mgr.ctx.core.authtoken, alloc).recv().content()
+ self.request_mgr.ctx.core.authtoken.value, alloc).recv().content()
oils.event.Event.parse_and_raise(alloc_id)
return alloc_id
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/acq/picklist.py
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/acq/picklist.py 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/acq/picklist.py 2008-02-18 16:55:07 UTC (rev 8762)
@@ -13,7 +13,7 @@
def retrieve(self):
picklist = self.ses.request(
'open-ils.acq.picklist.retrieve',
- self.request_mgr.ctx.core.authtoken, self.id, {'flesh_entry_count':1}).recv().content()
+ self.request_mgr.ctx.core.authtoken.value, self.id, {'flesh_entry_count':1}).recv().content()
oils.event.Event.parse_and_raise(picklist)
self.picklist = picklist
@@ -33,14 +33,14 @@
picklist_id = picklist_id or self.id
status = self.ses.request(
'open-ils.acq.picklist.delete',
- self.request_mgr.ctx.core.authtoken, picklist_id).recv().content()
+ self.request_mgr.ctx.core.authtoken.value, picklist_id).recv().content()
oils.event.Event.parse_and_raise(status)
return status
def delete_entry(self, entry_id):
status = self.ses.request(
'open-ils.acq.picklist_entry.delete',
- self.request_mgr.ctx.core.authtoken, entry_id).recv().content()
+ self.request_mgr.ctx.core.authtoken.value, entry_id).recv().content()
oils.event.Event.parse_and_raise(status)
return status
@@ -49,7 +49,7 @@
# grab the picklist entries
entries = self.ses.request(
'open-ils.acq.picklist_entry.picklist.retrieve',
- self.request_mgr.ctx.core.authtoken,
+ self.request_mgr.ctx.core.authtoken.value,
self.picklist.id(),
{
"offset" : kwargs.get('offset'),
@@ -64,7 +64,7 @@
if entry.provider():
provider = self.ses.request(
'open-ils.acq.provider.retrieve',
- self.request_mgr.ctx.core.authtoken,
+ self.request_mgr.ctx.core.authtoken.value,
entry.provider()).recv().content()
entry.provider(provider)
@@ -74,7 +74,7 @@
''' Returns my list of picklist objects '''
list = self.ses.request(
'open-ils.acq.picklist.user.retrieve',
- self.request_mgr.ctx.core.authtoken, {'flesh_entry_count':1}).recv().content()
+ self.request_mgr.ctx.core.authtoken.value, {'flesh_entry_count':1}).recv().content()
oils.event.Event.parse_and_raise(list)
usermgr = oilsweb.lib.user.User(self.request_mgr.ctx.core)
@@ -95,13 +95,13 @@
args = {'flesh': kwargs.get('flesh')}
entry = self.ses.request(
'open-ils.acq.picklist_entry.retrieve',
- self.request_mgr.ctx.core.authtoken, entry_id, args).recv().content()
+ self.request_mgr.ctx.core.authtoken.value, entry_id, args).recv().content()
oils.event.Event.parse_and_raise(entry)
if kwargs.get('flesh_provider'):
if entry.provider():
provider = self.ses.request(
'open-ils.acq.provider.retrieve',
- self.request_mgr.ctx.core.authtoken,
+ self.request_mgr.ctx.core.authtoken.value,
entry.provider()).recv().content()
entry.provider(provider)
@@ -112,18 +112,18 @@
# find and delete any existing picklist with the requested name
data = self.ses.request(
'open-ils.acq.picklist.name.retrieve',
- self.request_mgr.ctx.core.authtoken, pl_name).recv()
+ self.request_mgr.ctx.core.authtoken.value, pl_name).recv()
if data:
self.delete(data.content().id())
# create the new one
picklist = osrf.net_obj.NetworkObject.acqpl()
picklist.name(pl_name)
- picklist.owner(self.request_mgr.ctx.core.user.id())
+ picklist.owner(self.request_mgr.ctx.core.user.value.id())
picklist = self.ses.request(
'open-ils.acq.picklist.create',
- self.request_mgr.ctx.core.authtoken, picklist).recv().content()
+ self.request_mgr.ctx.core.authtoken.value, picklist).recv().content()
oils.event.Event.parse_and_raise(picklist)
return picklist
@@ -131,7 +131,7 @@
def create_entry(self, entry):
status = self.ses.request(
'open-ils.acq.picklist_entry.create',
- self.request_mgr.ctx.core.authtoken, entry).recv().content()
+ self.request_mgr.ctx.core.authtoken.value, entry).recv().content()
oils.event.Event.parse_and_raise(status)
return status
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/acq/search.py
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/acq/search.py 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/acq/search.py 2008-02-18 16:55:07 UTC (rev 8762)
@@ -12,12 +12,12 @@
if _z_sources:
return _z_sources
_z_sources = osrf.ses.ClientSession.atomic_request(
- oils.const.OILS_APP_SEARCH, EG_Z39_SOURCES, ctx.core.authtoken)
+ oils.const.OILS_APP_SEARCH, EG_Z39_SOURCES, ctx.core.authtoken.value)
return _z_sources
def multi_search(request_mgr, search):
ses = osrf.ses.ClientSession(oils.const.OILS_APP_SEARCH)
- req = ses.request(EG_Z39_SEARCH, request_mgr.ctx.core.authtoken, search)
+ req = ses.request(EG_Z39_SEARCH, request_mgr.ctx.core.authtoken.value, search)
pl_manager = oilsweb.lib.acq.picklist.PicklistMgr(request_mgr)
picklist_id = pl_manager.create_or_replace("")
@@ -45,18 +45,18 @@
'username' : [],
'password' : [],
'search' : {},
- 'limit' : request_mgr.ctx.acq.limit,
- 'offset' : request_mgr.ctx.acq.offset
+ 'limit' : request_mgr.ctx.acq.limit.value,
+ 'offset' : request_mgr.ctx.acq.offset.value
}
# collect the sources and credentials
- for src in request_mgr.ctx.acq.search_source:
+ for src in request_mgr.ctx.acq.search_source.value:
search['service'].append(src)
search['username'].append("") # XXX config values? in-db?
search['password'].append("") # XXX config values? in-db?
# collect the search classes
- for cls in request_mgr.ctx.acq.search_class:
+ for cls in request_mgr.ctx.acq.search_class.value:
if request_mgr.request.params[cls]:
search['search'][cls] = request_mgr.request.params[cls]
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/context.py
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/context.py 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/context.py 2008-02-18 16:55:07 UTC (rev 8762)
@@ -16,6 +16,7 @@
self.qname = None
self.multi = kwargs.get('multi')
self.session = kwargs.get('session')
+ self.value = self.default_value
class SubContext(object):
''' A SubContext is a class-specific context object that lives inside the global context object '''
@@ -43,7 +44,7 @@
q = ''
for f in self._fields:
if f.cgi_name and not f.session:
- val = getattr(getattr(self, f.app), f.name)
+ val = f.value
if val != f.default_value:
if isinstance(val, list):
for v in val:
@@ -59,7 +60,7 @@
from oilsweb.lib.base import session
for f in self._fields:
if f.cgi_name and f.session:
- val = getattr(getattr(self, f.app), f.name)
+ val = f.value
if val is not None and val != f.default_value:
session[f.cgi_name] = val
@@ -97,34 +98,24 @@
# session cache, and finally see if the data is in a cookie. If
# no data is found, use the default
# -------------------------------------------------------------------
- set = False
if item.cgi_name:
if item.cgi_name in req.params:
if item.multi:
- setattr(getattr(c, app), name, req.params.getall(item.cgi_name))
+ item.value = req.params.getall(item.cgi_name)
else:
- setattr(getattr(c, app), name, req.params[item.cgi_name])
- set = True
+ item.value = req.params[item.cgi_name]
else:
if item.session:
if item.cgi_name in session:
- setattr(getattr(c, app), name, session[item.cgi_name])
+ item.value = session[item.cgi_name]
set = True
else:
if item.cgi_name in req.cookies:
- setattr(getattr(c, app), name, req.cookies[item.cgi_name])
- set = True
+ item.value = req.cookies[item.cgi_name]
- if not set:
- setattr(getattr(c, app), name, item.default_value)
-
- # store the metatdata at <name>_
- setattr(getattr(c, app), "%s_" % name, item)
-
# run postinit after all contexts have been loaded
for app in _subContexts.keys():
ctx = getattr(c, app)
ctx.postinit()
return c
-
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/request.py
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/request.py 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/request.py 2008-02-18 16:55:07 UTC (rev 8762)
@@ -38,8 +38,8 @@
would be 'base/dashboard.html'
'''
self.finalize()
- self.ctx.core.page = tpath
- return pylons.templating.render('oils/%s/%s' % (self.ctx.core.skin, tpath))
+ self.ctx.core.page.value = tpath
+ return pylons.templating.render('oils/%s/%s' % (self.ctx.core.skin.value, tpath))
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/user.py
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/user.py 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/user.py 2008-02-18 16:55:07 UTC (rev 8762)
@@ -21,63 +21,63 @@
'staff',
pylons.config['oils_demo_workstation'])
oils.event.Event.parse_and_raise(evt)
- self.ctx.authtoken = evt['payload']['authtoken']
+ self.ctx.authtoken.value = evt['payload']['authtoken']
def fetch_user(self):
''' Grab the logged in user and their workstation '''
- if not self.ctx.authtoken:
+ if not self.ctx.authtoken.value:
self.try_auto_login()
- if not self.ctx.authtoken:
+ if not self.ctx.authtoken.value:
raise AuthException(_('No authentication token provided'))
- self.ctx.user = osrf.ses.ClientSession.atomic_request(
+ self.ctx.user.value = osrf.ses.ClientSession.atomic_request(
'open-ils.auth',
- 'open-ils.auth.session.retrieve', self.ctx.authtoken)
+ 'open-ils.auth.session.retrieve', self.ctx.authtoken.value)
- evt = oils.event.Event.parse_event(self.ctx.user)
+ evt = oils.event.Event.parse_event(self.ctx.user.value)
if evt and evt.text_code == 'NO_SESSION':
- # our authtoken has timed out. See if we can autologin
+ # our authtoken.value has timed out. See if we can autologin
self.try_auto_login()
- if not self.ctx.authtoken:
+ if not self.ctx.authtoken.value:
raise AuthException(_('No authentication token provided'))
- self.ctx.user = osrf.ses.ClientSession.atomic_request(
+ self.ctx.user.value = osrf.ses.ClientSession.atomic_request(
'open-ils.auth',
- 'open-ils.auth.session.retrieve', self.ctx.authtoken)
- oils.event.Event.parse_and_raise(self.ctx.user)
+ 'open-ils.auth.session.retrieve', self.ctx.authtoken.value)
+ oils.event.Event.parse_and_raise(self.ctx.user.value)
- self.ctx.workstation = oils.utils.csedit.CSEditor().retrieve_actor_workstation(self.ctx.user.wsid())
- if not self.ctx.workstation:
+ self.ctx.workstation.value = oils.utils.csedit.CSEditor().retrieve_actor_workstation(self.ctx.user.value.wsid())
+ if not self.ctx.workstation.value:
raise AuthException(_('No workstation found'))
def fetch_work_orgs(self):
work_orgs = osrf.ses.ClientSession.atomic_request(
'open-ils.actor',
'open-ils.actor.user.get_work_ous.ids',
- self.ctx.authtoken)
+ self.ctx.authtoken.value)
oils.event.Event.parse_and_raise(work_orgs)
return work_orgs
def highest_work_perm_set(self, perm):
perm_orgs = osrf.ses.ClientSession.atomic_request(
'open-ils.actor',
- 'open-ils.actor.user.work_perm.highest_org_set', self.ctx.authtoken, perm);
- self.ctx.high_perm_orgs[perm] = perm_orgs
+ 'open-ils.actor.user.work_perm.highest_org_set', self.ctx.authtoken.value, perm);
+ self.ctx.high_perm_orgs.value[perm] = perm_orgs
return perm_orgs
def highest_work_perm_tree(self, perm):
perm_orgs = self.highest_work_perm_set(perm)
if len(perm_orgs) == 0:
return None
- self.ctx.perm_tree[perm] = oils.org.OrgUtil.get_union_tree(perm_orgs)
- return self.ctx.perm_tree[perm]
+ self.ctx.perm_tree.value[perm] = oils.org.OrgUtil.get_union_tree(perm_orgs)
+ return self.ctx.perm_tree.value[perm]
def fetch_user_setting(self, setting):
setting = osrf.ses.ClientSession.atomic_request(
oils.const.OILS_APP_ACTOR,
'open-ils.actor.patron.settings.retrieve',
- self.ctx.authtoken, self.ctx.user.id(), setting)
+ self.ctx.authtoken.value, self.ctx.user.value.id(), setting)
oils.event.Event.parse_and_raise(setting)
return setting
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html 2008-02-18 16:55:07 UTC (rev 8762)
@@ -24,7 +24,7 @@
<%def name='block_body_content()'/>
<%def name='block_css()'>
- <link rel='stylesheet' type='text/css' href='${c.oils.core.media_prefix}/css/skin/${c.oils.core.skin}.css'/>
- <link rel='stylesheet' type='text/css' href='${c.oils.core.media_prefix}/css/theme/${c.oils.core.theme}.css'/>
+ <link rel='stylesheet' type='text/css' href='${c.oils.core.media_prefix.value}/css/skin/${c.oils.core.skin.value}.css'/>
+ <link rel='stylesheet' type='text/css' href='${c.oils.core.media_prefix.value}/css/theme/${c.oils.core.theme.value}.css'/>
</%def>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund.html 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund.html 2008-02-18 16:55:07 UTC (rev 8762)
@@ -5,29 +5,31 @@
<%def name="page_title()">${_('Create Fund')}</%def>
<%def name="block_content()">
-<form action='${c.oils.acq.prefix}/fund/create' method='POST'>
+<% from oils.org import OrgUtil %>
+
+<form action='${c.oils.acq.prefix.value}/fund/create' method='POST'>
<table class='oils-admin-table'>
<tbody>
<tr>
<td class='oils-admin-label'>${_('Fund Name')}</td>
<td>
- <input type='text' size='42' name='${c.oils.acq.fund_name_.cgi_name}'/>
+ <input type='text' size='42' name='${c.oils.acq.fund_name.cgi_name}'/>
</td>
</tr>
<tr>
<td class='oils-admin-label'>${_('Fund Owner')}</td>
<td>
${widget.org_select(
- c.oils.acq.fund_org_.cgi_name,
- c.oils.core.perm_tree['ADMIN_FUND'], c.oils.core.workstation.id(),
- c.oils.util.get_min_org_depth(c.oils.core.high_perm_orgs['ADMIN_FUND']))}
+ c.oils.acq.fund_org.cgi_name,
+ c.oils.core.perm_tree.value['ADMIN_FUND'], c.oils.core.workstation.id(),
+ OrgUtil.get_min_depth.value(c.oils.core.high_perm_orgs['ADMIN_FUND']))}
</td>
</tr>
<tr>
<td class='oils-admin-label'>${_('Fund Currency Type')}</td>
<td>
- <select name='${c.oils.acq.fund_currency_type_.cgi_name}'>
- % for type in c.oils.acq.currency_types:
+ <select name='${c.oils.acq.fund_currency_type.cgi_name}'>
+ % for type in c.oils.acq.currency_types.value:
<option value='${type.code()}'>${type.label()}</option>
% endfor
</select>
@@ -36,7 +38,7 @@
<tr>
<td class='oils-admin-label'>${_('Fund Year')}</td>
<td>
- <input type='text' size='42' name='${c.oils.acq.fund_year_.cgi_name}'/>
+ <input type='text' size='42' name='${c.oils.acq.fund_year.cgi_name}'/>
</td>
</tr>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund_allocation.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund_allocation.html 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund_allocation.html 2008-02-18 16:55:07 UTC (rev 8762)
@@ -5,22 +5,22 @@
<%def name="page_title()">${_('Create Funding Allocation')}</%def>
<%def name="block_content()">
-<form action='${c.oils.acq.prefix}/fund/allocate' method='POST'>
+<form action='${c.oils.acq.prefix.value}/fund/allocate' method='POST'>
<table class='oils-admin-table'>
<tbody>
<tr>
<td class='oils-admin-label'>${_('Fund')}</td>
<td>
- <input type='hidden' name='${c.oils.acq.fund_allocation_fund_.cgi_name}' value='${c.oils.acq.fund_id}'/>
- <span>${c.oils.acq.fund.name()}</span>
- <span>${c.oils.acq.fund.org().shortname()}</span>
+ <input type='hidden' name='${c.oils.acq.fund_allocation_fund.cgi_name}' value='${c.oils.acq.fund_id.value}'/>
+ <span>${c.oils.acq.fund.value.name()}</span>
+ <span>${c.oils.acq.fund.value.org().shortname()}</span>
</td>
</tr>
<tr>
<td class='oils-admin-label'>${_('Funding Source')}</td>
<td>
- <select name='${c.oils.acq.fund_allocation_source_.cgi_name}'>
- % for source in c.oils.acq.fund_source_list:
+ <select name='${c.oils.acq.fund_allocation_source.cgi_name}'>
+ % for source in c.oils.acq.fund_source_list.value:
<% source_label = _('%(name)s (balance = %(b)s)') % {'name':source.name(), 'b': source.summary()['balance']} %>
<option value='${source.id()}'>${source_label}</option>
% endfor
@@ -30,19 +30,19 @@
<tr>
<td class='oils-admin-label'>${_('Allocation Amount')}</td>
<td>
- <input type='text' size='12' name='${c.oils.acq.fund_allocation_amount_.cgi_name}'/>
+ <input type='text' size='12' name='${c.oils.acq.fund_allocation_amount.cgi_name}'/>
</td>
</tr>
<tr>
<td class='oils-admin-label'>${_('Allocation Percent')}</td>
<td>
- <input type='text' size='4' name='${c.oils.acq.fund_allocation_percent_.cgi_name}'/>
+ <input type='text' size='4' name='${c.oils.acq.fund_allocation_percent.cgi_name}'/>
</td>
</tr>
<tr>
<td class='oils-admin-label'>${_('Note')}</td>
<td>
- <textarea name='${c.oils.acq.fund_allocation_note_.cgi_name}'> </textarea>
+ <textarea name='${c.oils.acq.fund_allocation_note.cgi_name}'> </textarea>
</td>
</tr>
<tr>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund_source.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund_source.html 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund_source.html 2008-02-18 16:55:07 UTC (rev 8762)
@@ -5,29 +5,31 @@
<%def name="page_title()">${_('Create Funding Source')}</%def>
<%def name="block_content()">
-<form action='${c.oils.acq.prefix}/fund_source/create' method='POST'>
+<% from oils.org import OrgUtil %>
+
+<form action='${c.oils.acq.prefix.value}/fund_source/create' method='POST'>
<table class='oils-admin-table'>
<tbody>
<tr>
<td class='oils-admin-label'>${_('Funding Source Name')}</td>
<td>
- <input type='text' size='42' name='${c.oils.acq.fund_source_name_.cgi_name}'/>
+ <input type='text' size='42' name='${c.oils.acq.fund_source_name.cgi_name}'/>
</td>
</tr>
<tr>
<td class='oils-admin-label'>${_('Funding Source Owner')}</td>
<td>
${widget.org_select(
- c.oils.acq.fund_source_owner_.cgi_name,
- c.oils.core.perm_tree['CREATE_FUNDING_SOURCE'], c.oils.core.workstation.id(),
- c.oils.util.get_min_org_depth(c.oils.core.high_perm_orgs['CREATE_FUNDING_SOURCE']))}
+ c.oils.acq.fund_source_owner.cgi_name,
+ c.oils.core.perm_tree.value['CREATE_FUNDING_SOURCE'], c.oils.core.workstation.value.id(),
+ OrgUtil.get_min_depth(c.oils.core.high_perm_orgs.value['CREATE_FUNDING_SOURCE']))}
</td>
</tr>
<tr>
<td class='oils-admin-label'>${_('Funding Source Currency Type')}</td>
<td>
- <select name='${c.oils.acq.fund_source_currency_type_.cgi_name}'>
- % for type in c.oils.acq.currency_types:
+ <select name='${c.oils.acq.fund_source_currency_type.cgi_name}'>
+ % for type in c.oils.acq.currency_types.value:
<option value='${type.code()}'>${type.label()}</option>
% endfor
</select>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_funding_source_credit.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_funding_source_credit.html 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_funding_source_credit.html 2008-02-18 16:55:07 UTC (rev 8762)
@@ -7,10 +7,10 @@
<%def name="page_title()">${_('Create Funding Source Credit')}</%def>
<%def name="block_content()">
-<% source = c.oils.acq.fund_source %>
+<% source = c.oils.acq.fund_source.value %>
-<form action='${c.oils.acq.prefix}/fund_source/create_credit' method='POST'>
- <input type='hidden' name='${c.oils.acq.fund_source_id_.cgi_name}' value='${source.id()}'/>
+<form action='${c.oils.acq.prefix.value}/fund_source/create_credit' method='POST'>
+ <input type='hidden' name='${c.oils.acq.fund_source_id.cgi_name}' value='${source.id()}'/>
<table class='oils-admin-table'>
<tbody>
<tr>
@@ -22,12 +22,12 @@
</tr>
<tr>
<td class='oils-admin-label'>${_('Amount')}</td>
- <td><input type='text' size='8' name='${c.oils.acq.fund_source_credit_amount_.cgi_name}'/></td>
+ <td><input type='text' size='8' name='${c.oils.acq.fund_source_credit_amount.cgi_name}'/></td>
</tr>
<tr>
<td class='oils-admin-label'>${_('Note')}</td>
<td>
- <textarea name='${c.oils.acq.fund_source_credit_note_.cgi_name}'> </textarea>
+ <textarea name='${c.oils.acq.fund_source_credit_note.cgi_name}'> </textarea>
</td>
</tr>
<tr>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_provider.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_provider.html 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_provider.html 2008-02-18 16:55:07 UTC (rev 8762)
@@ -5,29 +5,31 @@
<%def name="page_title()">${_('Create Provider')}</%def>
<%def name="block_content()">
-<form action='${c.oils.acq.prefix}/provider/create' method='POST'>
+<% from oils.org import OrgUtil %>
+
+<form action='${c.oils.acq.prefix.value}/provider/create' method='POST'>
<table class='oils-admin-table'>
<tbody>
<tr>
<td class='oils-admin-label'>${_('Provider Name')}</td>
<td>
- <input type='text' size='42' name='${c.oils.acq.provider_name_.cgi_name}'/>
+ <input type='text' size='42' name='${c.oils.acq.provider_name.cgi_name}'/>
</td>
</tr>
<tr>
<td class='oils-admin-label'>${_('Provider Owner')}</td>
<td>
${widget.org_select(
- c.oils.acq.provider_owner_.cgi_name,
- c.oils.core.perm_tree['ADMIN_PROVIDER'], c.oils.core.workstation.id(),
- c.oils.util.get_min_org_depth(c.oils.core.high_perm_orgs['ADMIN_PROVIDER']))}
+ c.oils.acq.provider_owner.cgi_name,
+ c.oils.core.perm_tree.value['ADMIN_PROVIDER'], c.oils.core.workstation.value.id(),
+ OrgUtil.get_min_depth(c.oils.core.high_perm_orgs.value['ADMIN_PROVIDER']))}
</td>
</tr>
<tr>
<td class='oils-admin-label'>${_('Provider Currency Type')}</td>
<td>
- <select name='${c.oils.acq.provider_currency_type_.cgi_name}'>
- % for type in c.oils.acq.currency_types:
+ <select name='${c.oils.acq.provider_currency_type.cgi_name}'>
+ % for type in c.oils.acq.currency_types.value:
<option value='${type.code()}'>${type.label()}</option>
% endfor
</select>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_fund_sources.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_fund_sources.html 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_fund_sources.html 2008-02-18 16:55:07 UTC (rev 8762)
@@ -7,7 +7,7 @@
<div id='oils-acq-list-header' class='container'>
<div id='oils-acq-list-header-label'>${_('Funding Sources')}</div>
<div id='oils-acq-list-header-create'>
- <a href='${c.oils.acq.prefix}/fund_source/create'>${_('New Funding Source')}</a>
+ <a href='${c.oils.acq.prefix.value}/fund_source/create'>${_('New Funding Source')}</a>
</div>
</div>
@@ -22,9 +22,9 @@
</tr>
</thead>
<tbody>
- % for source in c.oils.acq.fund_source_list:
+ % for source in c.oils.acq.fund_source_list.value:
<tr>
- <td><a href='${c.oils.acq.prefix}/fund_source/view/${source.id()}'>${source.name()}</a></td>
+ <td><a href='${c.oils.acq.prefix.value}/fund_source/view/${source.id()}'>${source.name()}</a></td>
<td>${source.owner().name()}</td>
<td>${source.currency_type()}</td>
<td>${source.summary()['balance']}</td>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funds.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funds.html 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funds.html 2008-02-18 16:55:07 UTC (rev 8762)
@@ -7,7 +7,7 @@
<div id='oils-acq-list-header' class='container'>
<div id='oils-acq-list-header-label'>${_('Funds')}</div>
<div id='oils-acq-list-header-create'>
- <a href='${c.oils.acq.prefix}/fund/create'>${_('New Fund')}</a>
+ <a href='${c.oils.acq.prefix.value}/fund/create'>${_('New Fund')}</a>
</div>
</div>
@@ -22,9 +22,9 @@
</tr>
</thead>
<tbody>
- % for fund in c.oils.acq.fund_list:
+ % for fund in c.oils.acq.fund_list.value:
<tr>
- <td><a href='${c.oils.acq.prefix}/fund/view/${fund.id()}'>${fund.name()}</a></td>
+ <td><a href='${c.oils.acq.prefix.value}/fund/view/${fund.id()}'>${fund.name()}</a></td>
<td>${fund.org().name()}</td>
<td>${fund.year()}</td>
<td>${fund.summary()['combined_balance']}</td>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html 2008-02-18 16:55:07 UTC (rev 8762)
@@ -7,7 +7,7 @@
<div id='oils-acq-list-header' class='container'>
<div id='oils-acq-list-header-label'>${_('Providers')}</div>
<div id='oils-acq-list-header-create'>
- <a href='${c.oils.acq.prefix}/provider/create'>${_('New Provider')}</a>
+ <a href='${c.oils.acq.prefix.value}/provider/create'>${_('New Provider')}</a>
</div>
</div>
@@ -21,9 +21,9 @@
</tr>
</thead>
<tbody>
- % for provider in c.oils.acq.provider_list:
+ % for provider in c.oils.acq.provider_list.value:
<tr>
- <td><a href='${c.oils.acq.prefix}/provider/view/${provider.id()}'>${provider.name()}</a></td>
+ <td><a href='${c.oils.acq.prefix.value}/provider/view/${provider.id()}'>${provider.name()}</a></td>
<td>${provider.owner().name()}</td>
<td>${provider.currency_type()}</td>
</tr>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.html 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.html 2008-02-18 16:55:07 UTC (rev 8762)
@@ -1,11 +1,11 @@
# -*- coding: utf-8 -*-
<div class='oils-base-navigate-item'>
- <a href='${c.oils.core.prefix}/acq/fund/list'>${_('Funds')}</a>
+ <a href='${c.oils.core.prefix.value}/acq/fund/list'>${_('Funds')}</a>
</div>
<div class='oils-base-navigate-item'>
- <a href='${c.oils.core.prefix}/acq/fund_source/list'>${_('Funding Sources')}</a>
+ <a href='${c.oils.core.prefix.value}/acq/fund_source/list'>${_('Funding Sources')}</a>
</div>
<div class='oils-base-navigate-item'>
- <a href='${c.oils.core.prefix}/acq/provider/list'>${_('Providers')}</a>
+ <a href='${c.oils.core.prefix.value}/acq/provider/list'>${_('Providers')}</a>
</div>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html 2008-02-18 16:55:07 UTC (rev 8762)
@@ -4,12 +4,12 @@
<%def name="page_title()">${_('View Fund')}</%def>
<%def name="block_content()">
-<% fund = c.oils.acq.fund %>
+<% fund = c.oils.acq.fund.value %>
<div id='oils-acq-list-header' class='container'>
<div id='oils-acq-list-header-label'>${fund.name()}</div>
<div id='oils-acq-list-header-create'>
- <a href='${c.oils.acq.prefix}/fund/allocate?${c.oils.acq.fund_id_.cgi_name}=${fund.id()}'>${_('Allocate Money')}</a>
+ <a href='${c.oils.acq.prefix.value}/fund/allocate?${c.oils.acq.fund_id.cgi_name}=${fund.id()}'>${_('Allocate Money')}</a>
</div>
</div>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund_source.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund_source.html 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund_source.html 2008-02-18 16:55:07 UTC (rev 8762)
@@ -4,12 +4,12 @@
<%def name="page_title()">${_('View Funding Source')}</%def>
<%def name="block_content()">
-<% source = c.oils.acq.fund_source %>
+<% source = c.oils.acq.fund_source.value %>
<div id='oils-acq-list-header' class='container'>
<div id='oils-acq-list-header-label'>${source.name()}</div>
<div id='oils-acq-list-header-create'>
- <a href='${c.oils.acq.prefix}/fund_source/create_credit?${c.oils.acq.fund_source_id_.cgi_name}=${source.id()}'>${_('Add Credit')}</a>
+ <a href='${c.oils.acq.prefix.value}/fund_source/create_credit?${c.oils.acq.fund_source_id.cgi_name}=${source.id()}'>${_('Add Credit')}</a>
</div>
</div>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_provider.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_provider.html 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_provider.html 2008-02-18 16:55:07 UTC (rev 8762)
@@ -4,7 +4,7 @@
<%def name="page_title()">${_('View Provider')}</%def>
<%def name="block_content()">
-<% provider = c.oils.acq.provider %>
+<% provider = c.oils.acq.provider.value %>
<div id='oils-acq-list-header' class='container'>
<div id='oils-acq-list-header-label'>${provider.name()}</div>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/navigate.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/navigate.html 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/navigate.html 2008-02-18 16:55:07 UTC (rev 8762)
@@ -1,19 +1,19 @@
# -*- coding: utf-8 -*-
<div class='oils-base-navigate-item'>
- <a href='${c.oils.core.prefix}/acq/base/index'>${_('Home')}</a>
+ <a href='${c.oils.core.prefix.value}/acq/base/index'>${_('Home')}</a>
</div>
<div class='oils-base-navigate-item'>
- <a href='${c.oils.core.prefix}/acq/picklist/list'>${_('Picklists')}</a>
+ <a href='${c.oils.core.prefix.value}/acq/picklist/list'>${_('Picklists')}</a>
</div>
-% if c.oils.core.page.startswith('acq/picklist'):
+% if c.oils.core.page.value.startswith('acq/picklist'):
<div class='oils-base-navigate-sub-list'>
<%include file='picklist/navigate.html'/>
</div>
% endif
<div class='oils-base-navigate-item'>
- <a href='${c.oils.core.prefix}/acq/fund/list'>${_('Funds')}</a>
+ <a href='${c.oils.core.prefix.value}/acq/fund/list'>${_('Funds')}</a>
</div>
-% if c.oils.core.page.startswith('acq/financial'):
+% if c.oils.core.page.value.startswith('acq/financial'):
<div class='oils-base-navigate-sub-list'>
<%include file='financial/navigate.html'/>
</div>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/create.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/create.html 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/create.html 2008-02-18 16:55:07 UTC (rev 8762)
@@ -4,13 +4,13 @@
<%def name="page_title()">${_('Create Picklist')}</%def>
<%def name="block_content()">
-<form action='${c.oils.acq.prefix}/picklist/create' method='POST'>
+<form action='${c.oils.acq.prefix.value}/picklist/create' method='POST'>
<table class='oils-admin-table'>
<tbody>
<tr>
<td class='oils-admin-label'>${_('Picklist Name')}</td>
<td>
- <input type='text' size='42' name='${c.oils.acq.picklist_name_.cgi_name}'/>
+ <input type='text' size='42' name='${c.oils.acq.picklist_name.cgi_name}'/>
</td>
</tr>
<tr>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/navigate.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/navigate.html 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/navigate.html 2008-02-18 16:55:07 UTC (rev 8762)
@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
<div class='oils-base-navigate-item'>
- <a href='${c.oils.core.prefix}/acq/picklist/list'>${_('Manage')}</a>
+ <a href='${c.oils.core.prefix.value}/acq/picklist/list'>${_('Manage')}</a>
</div>
<div class='oils-base-navigate-item'>
- <a href='${c.oils.core.prefix}/acq/picklist/search'>${_('Title Search')}</a>
+ <a href='${c.oils.core.prefix.value}/acq/picklist/search'>${_('Title Search')}</a>
</div>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/picklist_entry_summary.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/picklist_entry_summary.html 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/picklist_entry_summary.html 2008-02-18 16:55:07 UTC (rev 8762)
@@ -2,12 +2,12 @@
${_('Picklist Entry')}
<div class='oils-acq-picklist-entry-attributes'>
<%
- provider = c.oils.acq.picklist_entry.provider() or ''
+ provider = c.oils.acq.picklist_entry.provider.value() or ''
if provider: provider.name()
- meta = _("Source %(data)s") % {"data":c.oils.acq.picklist_entry.source_label()}
+ meta = _("Source %(data)s") % {"data":c.oils.acq.picklist_entry.value.source_label()}
meta2 = _("Provider %(data)s") % {"data":provider}
- meta3 = _("Create date %(data)s") % {"data":c.oils.acq.picklist_entry.create_time()}
- meta4 = _("Last update time %(data)s") % {"data":c.oils.acq.picklist_entry.edit_time()}
+ meta3 = _("Create date %(data)s") % {"data":c.oils.acq.picklist_entry.value.create_time()}
+ meta4 = _("Last update time %(data)s") % {"data":c.oils.acq.picklist_entry.value.edit_time()}
%>
<div>${meta}</div>
<div>${meta2}</div>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/picklist_summary.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/picklist_summary.html 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/picklist_summary.html 2008-02-18 16:55:07 UTC (rev 8762)
@@ -1,9 +1,9 @@
<div id='oils-acq-picklist-header'>
- ${_('Picklist')} <span id='oils-acq-picklist-name'>${c.oils.acq.picklist.name()}</span>
+ ${_('Picklist')} <span id='oils-acq-picklist-name'>${c.oils.acq.picklist.value.name()}</span>
<div class='oils-acq-picklist-attributes'>
<%
- meta = _("Create date %(date)s") % {"date":c.oils.acq.picklist.create_time()}
- meta2 = _("Last updated %(date)s") % {"date":c.oils.acq.picklist.edit_time()}
+ meta = _("Create date %(date)s") % {"date":c.oils.acq.picklist.value.create_time()}
+ meta2 = _("Last updated %(date)s") % {"date":c.oils.acq.picklist.value.edit_time()}
%>
<div>${meta}</div>
<div>${meta2}</div>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/search.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/search.html 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/search.html 2008-02-18 16:55:07 UTC (rev 8762)
@@ -3,19 +3,19 @@
<%def name="page_title()">${_('Evergreen Acquisitions Search')}</%def>
<%def name="block_content()">
- <form method='GET' action='${c.oils.acq.prefix}/picklist/do_search'>
+ <form method='GET' action='${c.oils.acq.prefix.value}/picklist/do_search'>
<div id='oils-acq-search-block' class='container'>
<div id='oils-acq-search-sources-block'>
<div id='oils-acq-search-sources-label'>${_('Search Sources')}</div>
<ul id='oils-acq-search-sources-list'>
- <li><input type='checkbox' name='${c.oils.acq.search_source_.cgi_name}'
+ <li><input type='checkbox' name='${c.oils.acq.search_source.cgi_name}'
value='native-evergreen-catalog'>${_('Evergreen Catalog')}</input></li>
<li>
<div class='oils-acq-search-subsources-label'>${_("Z39.50 Sources")}</div>
<ul class='oils-acq-search-sources-sublist'>
- % for src,cfg in c.oils.acq.z39_sources.iteritems():
+ % for src,cfg in c.oils.acq.z39_sources.value.iteritems():
<li>
- <input type='checkbox' name='${c.oils.acq.search_source_.cgi_name}' value='${src}'>
+ <input type='checkbox' name='${c.oils.acq.search_source.cgi_name}' value='${src}'>
${src} ${cfg["host"]}:${cfg["db"]}
% if cfg['auth'] == 't':
<span class='oils-acq-search-source-auth'>*</span>
@@ -30,19 +30,19 @@
<div id='oils-acq-search-form-block'>
<div id='oils-acq-search-fields-label'>${_('Search Fields')}</div>
<table id='oils-acq-search-fields-table'>
- % for cls in c.oils.acq.search_classes_sorted:
+ % for cls in c.oils.acq.search_classes_sorted.value:
<tr class='oils-acq-search-form-row'>
- <td class='oils-acq-search-form-label'>${c.oils.acq.search_classes[cls]}</td>
+ <td class='oils-acq-search-form-label'>${c.oils.acq.search_classes.value[cls]}</td>
<td class='oils-acq-search-form-input'>
<input name='${cls}' size='24'/>
- <input type='hidden' name='${c.oils.acq.search_class_.cgi_name}' value='${cls}'/>
+ <input type='hidden' name='${c.oils.acq.search_class.cgi_name}' value='${cls}'/>
</td>
</tr>
% endfor
<tr>
<td>${_('Results Per Source')}</td>
<td>
- <select name='${c.oils.acq.limit_.cgi_name}'>
+ <select name='${c.oils.acq.limit.cgi_name}'>
<option value='5'>5</option>
<option value='10' selected='selected'>10</option>
<option value='15'>15</option>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html 2008-02-18 16:55:07 UTC (rev 8762)
@@ -8,8 +8,13 @@
<%include file='picklist_summary.html'/>
-<form method='POST' action='${c.oils.acq.prefix}/picklist/update'>
-<input type='hidden' name='${c.oils.acq.picklist_source_id_.cgi_name}' value='${c.oils.acq.picklist.id()}'/>
+<%
+ import oilsweb.lib.bib
+ from oilsweb.lib.acq.picklist import PicklistMgr
+%>
+
+<form method='POST' action='${c.oils.acq.prefix.value}/picklist/update'>
+<input type='hidden' name='${c.oils.acq.picklist_source_id.cgi_name}' value='${c.oils.acq.picklist.value.id()}'/>
<table id='oils-acq-picklist-table'>
<thead>
<tr>
@@ -17,27 +22,27 @@
<table id='oils-acq-pikclist-header-subtable'><tr>
<td id='oils-acq-picklist-paging-block'>
<%
- c.oils.acq.offset = int(c.oils.acq.offset)
- c.oils.acq.limit = int(c.oils.acq.limit)
+ c.oils.acq.offset.value = int(c.oils.acq.offset.value)
+ c.oils.acq.limit.value = int(c.oils.acq.limit.value)
# set up the paging info
paging = _('Entries %(offset)s - %(limit)s') % {
- 'offset': c.oils.acq.offset + 1,
- 'limit': c.oils.acq.limit + c.oils.acq.offset
+ 'offset': c.oils.acq.offset.value + 1,
+ 'limit': c.oils.acq.limit.value + c.oils.acq.offset.value
}
%>
${paging}
- % if c.oils.acq.offset > 0:
- <a href='?${c.oils.acq.offset_.cgi_name}=${c.oils.acq.offset - c.oils.acq.limit}'>«</a>
+ % if c.oils.acq.offset.value > 0:
+ <a href='?${c.oils.acq.offset.cgi_name}=${c.oils.acq.offset.value - c.oils.acq.limit.value}'>«</a>
% endif
- <a href='?${c.oils.acq.offset_.cgi_name}=${c.oils.acq.offset + c.oils.acq.limit}'>»</a>
+ <a href='?${c.oils.acq.offset.cgi_name}=${c.oils.acq.offset.value + c.oils.acq.limit.value}'>»</a>
</td>
<td id='oils-acq-picklist-actions-block'>
- <select name='${c.oils.acq.picklist_action_.cgi_name}'>
+ <select name='${c.oils.acq.picklist_action.cgi_name}'>
<option value='move_selected'>${_('Move Selected to Picklist...')}</option>
</select>
- <select name='${c.oils.acq.picklist_dest_id_.cgi_name}'>
+ <select name='${c.oils.acq.picklist_dest_id.cgi_name}'>
<option selected='selected' value=''>${_('-- Select A Picklist --')}</option>
- % for list in c.oils.acq.picklist_list:
+ % for list in c.oils.acq.picklist_list.value:
<option value='${list.id()}'>${list.name()}</option>
% endfor
</select>
@@ -48,32 +53,32 @@
</tr>
</thead>
<tbody>
- % for entry in c.oils.acq.picklist.entries():
+ % for entry in c.oils.acq.picklist.value.entries():
<tr class='oils-acq-picklist-records-title-row'>
<td rowspan='3'>
<img class='oils-acq-picklist-records-jacket'
- src='${c.oils.core.ac_prefix}/jacket/small/${c.oils.util.scrub_isbn(c.oils.acq.find_entry_attr(entry, "isbn"))}'/>
+ src='${c.oils.core.ac_prefix.value}/jacket/small/${oilsweb.lib.bib.scrub_isbn(PicklistMgr.find_entry_attr(entry, "isbn"))}'/>
</td>
<td>
- <a href='../view_entry/${entry.id()}'>${c.oils.acq.find_entry_attr(entry, "title")}</a>
+ <a href='../view_entry/${entry.id()}'>${PicklistMgr.find_entry_attr(entry, "title")}</a>
</td>
<td class='oils-acq-picklist-records-service-td'>
% if entry.provider():
${entry.provider().name()}
% endif
</td>
- <td><input type='checkbox' name='${c.oils.acq.picklist_entry_id_list_.cgi_name}' value='${entry.id()}'/></td>
+ <td><input type='checkbox' name='${c.oils.acq.picklist_entry_id_list.cgi_name}' value='${entry.id()}'/></td>
</tr>
<tr class='oils-acq-picklist-records-author-row'>
- <td colspan='4'>${c.oils.acq.find_entry_attr(entry, "author")}
+ <td colspan='4'>${PicklistMgr.find_entry_attr(entry, "author")}
</tr>
<tr class='oils-acq-picklist-records-phys_desc-row'>
<td colspan='4'>
- ${c.oils.acq.find_entry_attr(entry, "isbn")} |
- ${c.oils.acq.find_entry_attr(entry, "pubdate")} |
- ${c.oils.acq.find_entry_attr(entry, "pagination")}
- <a class='oils-acq-picklist-entry-delete-link' href='${c.oils.acq.prefix}/picklist/delete_entry/${entry.id()}'>${_('Delete')}</a>
+ ${PicklistMgr.find_entry_attr(entry, "isbn")} |
+ ${PicklistMgr.find_entry_attr(entry, "pubdate")} |
+ ${PicklistMgr.find_entry_attr(entry, "pagination")}
+ <a class='oils-acq-picklist-entry-delete-link' href='${c.oils.acq.prefix.value}/picklist/delete_entry/${entry.id()}'>${_('Delete')}</a>
</td>
</tr>
% endfor
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_entry.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_entry.html 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_entry.html 2008-02-18 16:55:07 UTC (rev 8762)
@@ -6,7 +6,7 @@
<%include file='picklist_summary.html'/>
<%include file='picklist_entry_summary.html'/>
<table id='oils-acq-picklist-entry-summary'>
- % for attr in c.oils.acq.picklist_entry.attributes():
+ % for attr in c.oils.acq.picklist_entry.value.attributes():
<tr>
<td class='oils-acq-picklist-entry-attr-name'>
${attr.attr_name()}
@@ -20,7 +20,7 @@
<div id='oils-acq-picklist-entry-marc-block'>
<div id='oils-acq-picklist-entry-marc'>
- ${unicode(c.oils.acq.picklist_entry_marc_html, 'utf-8')}
+ ${unicode(c.oils.acq.picklist_entry_marc_html.value, 'utf-8')}
</div>
</div>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_list.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_list.html 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_list.html 2008-02-18 16:55:07 UTC (rev 8762)
@@ -6,7 +6,7 @@
<div id='oils-acq-list-header' class='container'>
<div id='oils-acq-list-header-label'>${_('My Picklists')}</div>
<div id='oils-acq-list-header-create'>
- <a href='${c.oils.acq.prefix}/picklist/create'>${_('New Picklist')}</a>
+ <a href='${c.oils.acq.prefix.value}/picklist/create'>${_('New Picklist')}</a>
</div>
</div>
@@ -22,13 +22,13 @@
</tr>
</thead>
<tbody>
- % for picklist in c.oils.acq.picklist_list:
+ % for picklist in c.oils.acq.picklist_list.value:
<tr>
- <td><a href='${c.oils.acq.prefix}/picklist/view/${picklist.id()}'>${picklist.name()}</a></td>
+ <td><a href='${c.oils.acq.prefix.value}/picklist/view/${picklist.id()}'>${picklist.name()}</a></td>
<td>${picklist.create_time()}</td>
<td>${picklist.edit_time()}</td>
<td>${picklist.entry_count()}</td>
- <td><a href='${c.oils.acq.prefix}/picklist/delete/${picklist.id()}'>${_('Delete')}</a></td>
+ <td><a href='${c.oils.acq.prefix.value}/picklist/delete/${picklist.id()}'>${_('Delete')}</a></td>
</tr>
% endfor
</tbody>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/admin/navigate.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/admin/navigate.html 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/admin/navigate.html 2008-02-18 16:55:07 UTC (rev 8762)
@@ -1,17 +1,17 @@
<span>
- <a href='${c.oils.adm.prefix}/search/${c.oils.adm.object_class}'>${_('Search')}</a>
+ <a href='${c.oils.adm.prefix.value}/search/${c.oils.adm.object_class.value}'>${_('Search')}</a>
</span>
-% if c.oils.adm.mode != 'create' and c.oils.core.page != 'admin/index.html':
+% if c.oils.adm.mode.value != 'create' and c.oils.core.page.value != 'admin/index.html':
<span>
- <a href='${c.oils.adm.prefix}/create/${c.oils.adm.object_class}'>${_('Create')}</a>
+ <a href='${c.oils.adm.prefix.value}/create/${c.oils.adm.object_class.value}'>${_('Create')}</a>
</span>
- % if c.oils.adm.mode != 'update':
+ % if c.oils.adm.mode.value != 'update':
<span>
- <a href='${c.oils.adm.prefix}/update/${c.oils.adm.object_class}/${c.oils.adm.object.id()}'>${_('Update')}</a>
+ <a href='${c.oils.adm.prefix.value}/update/${c.oils.adm.object_class.value}/${c.oils.adm.object.value.id()}'>${_('Update')}</a>
</span>
% endif
<span>
- <a href='${c.oils.adm.prefix}/delete/${c.oils.adm.object_class}/${c.oils.adm.object.id()}'>${_('Delete')}</a>
+ <a href='${c.oils.adm.prefix.value}/delete/${c.oils.adm.object_class.value}/${c.oils.adm.object.value.id()}'>${_('Delete')}</a>
</span>
% endif
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/admin/object.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/admin/object.html 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/admin/object.html 2008-02-18 16:55:07 UTC (rev 8762)
@@ -4,31 +4,31 @@
<%def name="page_title()">${_('Evergreen Admin')}</%def>
<%def name="block_content()">
- <div id='oils-admin-object-lable'>${c.oils.adm.object_meta.label}</div>
- % if c.oils.adm.mode == 'delete':
+ <div id='oils-admin-object-lable'>${c.oils.adm.object_meta.value.label}</div>
+ % if c.oils.adm.mode.value == 'delete':
<div>
<%
## Why does doing this inline (inside ${...}) give me a syntax error????
- string = _("Are you sure you want to delete %(cls)s with id %(id)d?") % {"cls":c.oils.adm.object_class, "id":c.oils.adm.object.id()}
+ string = _("Are you sure you want to delete %(cls)s with id %(id)d?") % {"cls":c.oils.adm.object_class.value, "id":c.oils.adm.object.value.id()}
%>
${string}
</div>
% else:
<form action='update_object' method='POST'>
<table id='oils-admin-object-table'>
- % for fieldmeta in [ f for f in c.oils.adm.object_meta.fields if not f.virtual]:
+ % for fieldmeta in [ f for f in c.oils.adm.object_meta.value.fields if not f.virtual]:
<tr>
<td>${fieldmeta.label}</td>
<td>
- % if c.oils.adm.mode == 'update':
+ % if c.oils.adm.mode.value == 'update':
(${fieldmeta.rpt_datatype})
- ${widget.load(fieldmeta.rpt_datatype,fieldmeta.name, getattr(c.oils.adm.object, fieldmeta.name)())}
+ ${widget.load(fieldmeta.rpt_datatype,fieldmeta.name, getattr(c.oils.adm.object.value, fieldmeta.name)())}
% else:
- % if c.oils.adm.mode == 'create':
+ % if c.oils.adm.mode.value == 'create':
<input type='text' size='36' />
% else:
- % if c.oils.adm.mode == 'view':
- <span>${unicode(getattr(c.oils.adm.object, fieldmeta.name)())}</span>
+ % if c.oils.adm.mode.value == 'view':
+ <span>${unicode(getattr(c.oils.adm.object.value, fieldmeta.name)())}</span>
% endif
% endif
% endif
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/common/widgets.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/common/widgets.html 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/common/widgets.html 2008-02-18 16:55:07 UTC (rev 8762)
@@ -1,15 +1,19 @@
-<!-- vim:set filetype=mako: -->
+<!--
+ vim:ft=mako:
+-->
<!--
Define some common widgets
-->
+
<%def name='org_draw_node(node, indent=0, selected=None, disable_depth=-1)'>
+ <% import oils.org %>
<option value='${node.id()}'
% if selected == node.id():
selected='selected'
% endif
- % if c.oils.util.get_org_type(node).depth() < disable_depth:
+ % if oils.org.OrgUtil.get_org_type(node).depth() < disable_depth:
disabled='disabled'
% endif
>
@@ -36,7 +40,7 @@
-->
<%
if tree is None:
- tree = c.oils.core.org_tree
+ tree = c.oils.core.org_tree.value
%>
<select name='${select_name}'>
${org_draw_node(tree, 0, selected, disable_depth)}
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/footer.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/footer.html 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/footer.html 2008-02-18 16:55:07 UTC (rev 8762)
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-
-${_('Powered By')} <img src='${c.oils.core.media_prefix}/images/eg_tiny_logo.jpg'/>
+${_('Powered By')} <img src='${c.oils.core.media_prefix.value}/images/eg_tiny_logo.jpg'/>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/header.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/header.html 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/header.html 2008-02-18 16:55:07 UTC (rev 8762)
@@ -11,6 +11,6 @@
<span id='oils-base-header-auto-login'>${_('Auto-login is enabled')}</span>|
% endif
<span id='oils-base-header-user-info'>
- ${c.oils.core.user.usrname()} / ${c.oils.core.workstation.name()}
+ ${c.oils.core.user.value.usrname()} / ${c.oils.core.workstation.value.name()}
</span>
</div>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/navigate.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/navigate.html 2008-02-16 18:15:13 UTC (rev 8761)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/navigate.html 2008-02-18 16:55:07 UTC (rev 8762)
@@ -1,23 +1,23 @@
# -*- coding: utf-8 -*-
<div id='oils-base-navigate-list'>
<div class='oils-base-navigate-item'>
- <a href='${c.oils.core.prefix}/base/dashboard'>${_('Dashboard')}</a>
+ <a href='${c.oils.core.prefix.value}/base/dashboard'>${_('Dashboard')}</a>
</div>
<div class='oils-base-navigate-item'>
- <a href='${c.oils.core.prefix}/acq/base/index'>${_('Acquisitions')}</a>
+ <a href='${c.oils.core.prefix.value}/acq/base/index'>${_('Acquisitions')}</a>
</div>
- % if c.oils.core.page.startswith('acq'):
+ % if c.oils.core.page.value.startswith('acq'):
<div class='oils-base-navigate-sub-list'>
<%include file='acq/navigate.html'/>
</div>
% endif
<!--
<div class='oils-base-navigate-item'>
- <a href='${c.oils.core.prefix}/ser/index'>${_('Serials')}</a>
+ <a href='${c.oils.core.prefix.value}/ser/index'>${_('Serials')}</a>
</div>
-->
<div class='oils-base-navigate-item'>
- <a href='${c.oils.core.prefix}/admin/index'>${_('Admin')}</a>
+ <a href='${c.oils.core.prefix.value}/admin/index'>${_('Admin')}</a>
</div>
</div>
More information about the open-ils-commits
mailing list