[open-ils-commits] r8746 - in branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb: controllers/acq templates/oils/default/acq templates/oils/default/acq/financial

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-02-13 13:15:23 -0500 (Wed, 13 Feb 2008)
New Revision: 8746

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/templates/oils/default/acq/financial/create_fund.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/navigate.html
Log:
added basic provider list/create/view

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-13 18:14:59 UTC (rev 8745)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/__init__.py	2008-02-13 18:15:23 UTC (rev 8746)
@@ -55,7 +55,6 @@
         self.fund_source_credit_amount = ContextItem(cgi_name='acq.fsca')
         self.fund_source_credit_note = ContextItem(cgi_name='acq.fscn')
 
-
         self.fund_allocation = ContextItem()
         self.fund_allocation_list = ContextItem()
         self.fund_allocation_source= ContextItem(cgi_name='acq.fas')
@@ -64,7 +63,14 @@
         self.fund_allocation_percent = ContextItem(cgi_name='acq.fap')
         self.fund_allocation_note = ContextItem(cgi_name='acq.fan')
 
+        self.provider = ContextItem()
+        self.provider_id = ContextItem()
+        self.provider_list = ContextItem()
+        self.provider_name = ContextItem(cgi_name='acq.pn')
+        self.provider_currency_type = ContextItem(cgi_name='acq.pct')
+        self.provider_owner = ContextItem(cgi_name='acq.po')
 
+
         # -------------------------------------------------------------
         # utility functions
         self.find_entry_attr = ContextItem(

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-13 18:14:59 UTC (rev 8745)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/fund.py	2008-02-13 18:15:23 UTC (rev 8746)
@@ -67,7 +67,7 @@
             return redirect_to(controller='acq/fund', action='view', id=fund_id)
 
         usermgr = oilsweb.lib.user.User(r.ctx.core)
-        tree = usermgr.highest_work_perm_tree('CREATE_FUND')
+        tree = usermgr.highest_work_perm_tree('ADMIN_FUND')
 
         types = ses.request(
             'open-ils.acq.currency_type.all.retrieve',

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-13 18:14:59 UTC (rev 8745)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund.html	2008-02-13 18:15:23 UTC (rev 8746)
@@ -19,8 +19,8 @@
                 <td> 
                     ${widget.org_select(
                         c.oils.acq.fund_org_.cgi_name, 
-                        c.oils.core.perm_tree['CREATE_FUND'], c.oils.core.workstation.id(),
-                        c.oils.util.get_min_org_depth(c.oils.core.high_perm_orgs['CREATE_FUND']))}
+                        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']))}
                 </td>
             </tr>
             <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-13 18:14:59 UTC (rev 8745)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.html	2008-02-13 18:15:23 UTC (rev 8746)
@@ -5,3 +5,7 @@
 <div class='oils-base-navigate-item'>
     <a href='${c.oils.core.prefix}/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>
+</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-13 18:14:59 UTC (rev 8745)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/navigate.html	2008-02-13 18:15:23 UTC (rev 8746)
@@ -12,9 +12,6 @@
 % endif
 <div class='oils-base-navigate-item'>
     <a href='${c.oils.core.prefix}/acq/fund/list'>${_('Funds')}</a>
-    <!--
-    <a href='${c.oils.core.prefix}/acq/fund/list'>${_('Funds')}</a>
-    -->
 </div>
 % if c.oils.core.page.startswith('acq/financial'):
     <div class='oils-base-navigate-sub-list'>