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

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-02-05 15:00:37 -0500 (Tue, 05 Feb 2008)
New Revision: 8647

Modified:
   branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/fund.py
   branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/acq/fund.py
   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_source.html
Log:
more basic fund crud interfaces

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-05 20:00:16 UTC (rev 8646)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/fund.py	2008-02-05 20:00:37 UTC (rev 8647)
@@ -12,7 +12,7 @@
         r.ctx.core.org_tree = oils.org.OrgUtil.fetch_org_tree()
         fund_mgr = oilsweb.lib.acq.fund.FundMgr(r)
         fund = fund_mgr.retrieve(kwargs.get('id'))
-        fund.owner(oils.org.OrgUtil.get_org_unit(fund.owner())) # flesh the owner
+        fund.org(oils.org.OrgUtil.get_org_unit(fund.org())) # flesh the org
         r.ctx.acq.fund = fund
         return r.render('acq/financial/view_fund.html')
 
@@ -21,7 +21,7 @@
         fund_mgr = oilsweb.lib.acq.fund.FundMgr(r)
         r.ctx.acq.fund_list = fund_mgr.retrieve_org_funds()
         for f in r.ctx.acq.fund_list:
-            f.owner(oils.org.OrgUtil.get_org_unit(f.owner()))
+            f.org(oils.org.OrgUtil.get_org_unit(f.org()))
         return r.render('acq/financial/list_funds.html')
             
 

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-05 20:00:16 UTC (rev 8646)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/acq/fund.py	2008-02-05 20:00:37 UTC (rev 8647)
@@ -21,18 +21,13 @@
         oils.event.Event.parse_and_raise(fund)
         return fund
 
-    ''' XXX update to look like a fund 
     def retrieve_org_funds(self):
         funds = self.ses.request(
             'open-ils.acq.fund.org.retrieve', 
-            self.request_mgr.ctx.core.authtoken, 
-            self.request_mgr.ctx.core.workstation.owning_lib(),
-            {"full_path":1}).recv().content()
+            self.request_mgr.ctx.core.authtoken).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', 

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-05 20:00:16 UTC (rev 8646)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/navigate.html	2008-02-05 20:00:37 UTC (rev 8647)
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 <div class='oils-base-navigate-item'>
+    <a href='${c.oils.core.prefix}/acq/fund/list'>${_('Funds')}</a>
+</div>
+<div class='oils-base-navigate-item'>
     <a href='${c.oils.core.prefix}/acq/fund/create'>${_('New Fund')}</a>
 </div>
 <div class='oils-base-navigate-item'>

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-05 20:00:16 UTC (rev 8646)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund_source.html	2008-02-05 20:00:37 UTC (rev 8647)
@@ -3,23 +3,20 @@
 <%namespace file='../../common/widgets.html' name='widget'/>
 <%def name="page_title()">${_('View Fund Source')}</%def>
 <%def name="block_content()">
-
-<form action='${c.oils.acq.prefix}/fund_source/create' method='POST'>
-    <table class='oils-admin-table'>
-        <tbody>
-            <tr>
-                <td class='oils-admin-label'>${_('Fund Source Name')}</td>
-                <td>${c.oils.acq.fund_source.name()}</td>
-            </tr>
-            <tr>
-                <td class='oils-admin-label'>${_('Fund Source Onwer')}</td>
-                <td>${c.oils.acq.fund_source.owner().name()}</td> 
-            </tr>
-            <tr>
-                <td class='oils-admin-label'>${_('Fund Source Currency Type')}</td>
-                <td>${c.oils.acq.fund_source.currency_type()}</td> 
-            </tr>
-        </tbody>
-    </table>
-</form>
+<table class='oils-admin-table'>
+    <tbody>
+        <tr>
+            <td class='oils-admin-label'>${_('Fund Source Name')}</td>
+            <td>${c.oils.acq.fund_source.name()}</td>
+        </tr>
+        <tr>
+            <td class='oils-admin-label'>${_('Fund Source Onwer')}</td>
+            <td>${c.oils.acq.fund_source.owner().name()}</td> 
+        </tr>
+        <tr>
+            <td class='oils-admin-label'>${_('Fund Source Currency Type')}</td>
+            <td>${c.oils.acq.fund_source.currency_type()}</td> 
+        </tr>
+    </tbody>
+</table>
 </%def>