Add ability to view all picklists, not just mine.

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

diff --git a/Open-ILS/web/oilsweb/oilsweb/controllers/acq/picklist.py b/Open-ILS/web/oilsweb/oilsweb/controllers/acq/picklist.py
index 6366cb9..6cdedb0 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/controllers/acq/picklist.py
+++ b/Open-ILS/web/oilsweb/oilsweb/controllers/acq/picklist.py
@@ -52,6 +52,11 @@ class PicklistController(BaseController):
         r.ctx.acq.picklist_list.value = pl_manager.retrieve_list()
         return r.render('acq/picklist/view_list.html')
          
+    def listall(self):
+        r = RequestMgr()
+        pl_manager = oilsweb.lib.acq.picklist.PicklistMgr(r)
+        r.ctx.acq.picklist_list.value = pl_manager.retrieve_list(all=True)
+        return r.render('acq/picklist/view_listall.html')
 
     def search(self):
         r = RequestMgr()

diff --git a/Open-ILS/web/oilsweb/oilsweb/lib/acq/picklist.py b/Open-ILS/web/oilsweb/oilsweb/lib/acq/picklist.py
index 23ac6c5..05a0c80 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/lib/acq/picklist.py
+++ b/Open-ILS/web/oilsweb/oilsweb/lib/acq/picklist.py
@@ -70,11 +70,16 @@ class PicklistMgr(object):
 
         self.picklist.entries(entries)
 
-    def retrieve_list(self):
+    def retrieve_list(self, all=False):
         ''' Returns my list of picklist objects '''
-        list = self.ses.request(
-            'open-ils.acq.picklist.user.retrieve', 
-            self.request_mgr.ctx.core.authtoken.value, {'flesh_entry_count':1}).recv().content()
+        if (all):
+            request = 'open-ils.acq.picklist.user.all.retrieve.atomic'
+        else:
+            request = 'open-ils.acq.picklist.user.retrieve'
+
+        list = self.ses.request(request,
+                                self.request_mgr.ctx.core.authtoken.value,
+                                {'flesh_entry_count':1, 'flesh_username':1}).recv().content()
         oils.event.Event.parse_and_raise(list)
 
         usermgr = oilsweb.lib.user.User(self.request_mgr.ctx.core)

diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css
index 266a1bf..f3c7b22 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css
+++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css
@@ -43,7 +43,7 @@
 
 #oils-acq-list-header { margin: 10px; width: 98%;}
 #oils-acq-list-header-label { float: left; }
-#oils-acq-list-header-create { float: right; }
+#oils-acq-list-header-actions { float: right; }
 
 /* picklist entry page */
 #oils-acq-picklist-entry-header { padding: 4px; margin-bottom: 20px; }

diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default/acq.css b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default/acq.css
index e5fdc06..2428aa0 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default/acq.css
+++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default/acq.css
@@ -30,7 +30,7 @@
 
 #oils-acq-list-header {border-bottom: 1px solid #6BA160;}
 #oils-acq-list-header-label { font-weight: bold; font-size: 110%; }
-#oils-acq-list-header-create { font-weight: bold; }
+#oils-acq-list-header-actions { font-weight: bold; }
 
 
 /* entry display */

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_fund_sources.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_fund_sources.html
index 789b8b3..410ccb1 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_fund_sources.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_fund_sources.html
@@ -6,7 +6,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'>
+    <div id='oils-acq-list-header-actions'>
         <a href='${c.oils.acq.prefix.value}/fund_source/create'>${_('New Funding Source')}</a>
     </div>
 </div>

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funds.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funds.html
index a0e5710..ec1ae65 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funds.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funds.html
@@ -6,7 +6,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'>
+    <div id='oils-acq-list-header-actions'>
         <a href='${c.oils.acq.prefix.value}/fund/create'>${_('New Fund')}</a>
     </div>
 </div>

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html
index b1f45c0..e28816b 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html
@@ -6,7 +6,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'>
+    <div id='oils-acq-list-header-actions'>
         <a href='${c.oils.acq.prefix.value}/provider/create'>${_('New Provider')}</a>
     </div>
 </div>

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html
index a39ac0d..935c3a0 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html
@@ -8,7 +8,7 @@
 
 <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'>
+    <div id='oils-acq-list-header-actions'>
         <a href='${c.oils.acq.prefix.value}/fund/allocate?${c.oils.acq.fund_id.cgi_name}=${fund.id()}'>${_('Allocate Money')}</a>
     </div>
 </div>

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund_source.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund_source.html
index 8f12de9..705f2ce 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund_source.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund_source.html
@@ -8,7 +8,7 @@
 
 <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'>
+    <div id='oils-acq-list-header-actions'>
         <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>

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_list.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_list.html
index 1280f13..8d8bb7c 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_list.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_list.html
@@ -5,7 +5,8 @@
 
 <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'>
+    <div id='oils-acq-list-header-actions'>
+        <a href="${c.oils.acq.prefix.value}/picklist/listall">${_('View All Picklists')}</a>
         <a href='${c.oils.acq.prefix.value}/picklist/create'>${_('New Picklist')}</a>
     </div>
 </div>

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_listall.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_listall.html
new file mode 100644 (file)
index 0000000..ba45909
--- /dev/null
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_listall.html
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+<%inherit file='../base.html'/>
+<%def name="page_title()">${_('Evergreen All Picklists')}</%def>
+<%def name="block_content()">
+
+<div id='oils-acq-list-header' class='container'>
+    <div id='oils-acq-list-header-label'>${_('All Picklists')}</div>
+    <div id='oils-acq-list-header-actions'>
+        <a href="${c.oils.acq.prefix.value}/picklist/list">${_('View My Picklists')}</a>
+        <a href='${c.oils.acq.prefix.value}/picklist/create'>${_('New Picklist')}</a>
+    </div>
+</div>
+
+<table id='oils-acq-picklist-list-table'>
+    <thead>
+        <tr>
+            <td>${_('Name')}</td>
+           <td>${_('Owner')}</td>
+            <td>${_('Creation Date')}</td>
+            <td>${_('Edit Date')}</td>
+            <td>${_('Number of Entries')}</td>
+            <td/>
+            <td/>
+        </tr>
+    </thead>
+    <tbody>
+    % for picklist in c.oils.acq.picklist_list.value:
+    <tr>
+        <td><a href='${c.oils.acq.prefix.value}/picklist/view/${picklist.id()}'>${picklist.name()}</a></td>
+       <td>${picklist.owner()}</td>
+        <td>${picklist.create_time()}</td>
+        <td>${picklist.edit_time()}</td>
+        <td>${picklist.entry_count()}</td>
+        <td><a href='${c.oils.acq.prefix.value}/picklist/delete/${picklist.id()}'>${_('Delete')}</a></td>
+    </tr>
+    % endfor
+    </tbody>
+</table>
+</%def>