added basic provider list/create/view

git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@8746 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/oilsweb/oilsweb/controllers/acq/__init__.py b/Open-ILS/web/oilsweb/oilsweb/controllers/acq/__init__.py
index f3aec13..d320542 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/controllers/acq/__init__.py
+++ b/Open-ILS/web/oilsweb/oilsweb/controllers/acq/__init__.py
@@ -55,7 +55,6 @@ class AcqContext(SubContext):
         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,6 +63,13 @@ class AcqContext(SubContext):
         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

diff --git a/Open-ILS/web/oilsweb/oilsweb/controllers/acq/fund.py b/Open-ILS/web/oilsweb/oilsweb/controllers/acq/fund.py
index 2620a18..020d69d 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/controllers/acq/fund.py
+++ b/Open-ILS/web/oilsweb/oilsweb/controllers/acq/fund.py
@@ -67,7 +67,7 @@ class FundController(BaseController):
             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',

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund.html
index d6d0a22..b656485 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/create_fund.html
@@ -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>

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.html
index 84c6ab3..4745c4a 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.html
@@ -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>
+

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/navigate.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/navigate.html
index a708bd5..76068da 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/navigate.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/navigate.html
@@ -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'>