[Mpuls-commits] r4999 - in base/trunk: . mpulsweb/controllers mpulsweb/templates/casebundle

[scm-commit@wald.intevation.org]

Author: ludwig
Date: 2011-05-24 15:51:15 +0200 (Tue, 24 May 2011)
New Revision: 4999

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/controllers/case_bundle.py
   base/trunk/mpulsweb/templates/casebundle/standin.mako
Log:
Remove the case editor groups from the choose standin list.
And add "no data found" to the standin dialog in no groups found case.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2011-05-24 11:46:20 UTC (rev 4998)
+++ base/trunk/ChangeLog	2011-05-24 13:51:15 UTC (rev 4999)
@@ -1,5 +1,12 @@
 2011-05-24  Ludwig Reiter <ludwig.reiter at inteation.de>
 
+	* mpulsweb/controllers/case_bundle.py,
+	mpulsweb/templates/casebundle/standin.mako:
+	Remove the case editor groups from the choose standin list.
+	And add "no data found" to the standin dialog in no groups found case.
+
+2011-05-24  Ludwig Reiter <ludwig.reiter at inteation.de>
+
 	* mpulsweb/templates/administration/overview_user.mako:
 	Issue1920: Another small fix.
 

Modified: base/trunk/mpulsweb/controllers/case_bundle.py
===================================================================
--- base/trunk/mpulsweb/controllers/case_bundle.py	2011-05-24 11:46:20 UTC (rev 4998)
+++ base/trunk/mpulsweb/controllers/case_bundle.py	2011-05-24 13:51:15 UTC (rev 4999)
@@ -137,6 +137,8 @@
                 user_list = UserListObject()
                 group_filter = [u.gid for u in user_list.getAdminList()]
                 group_filter.append(user.gid)
+                for case in case_bundle.getCases():
+                    group_filter.append(case.getEditor().gid)
                 c.group_list = group_list.getGroupList(group_filter)
                 c.case_list = case_bundle.getCases()
                 c.current_user = user

Modified: base/trunk/mpulsweb/templates/casebundle/standin.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/standin.mako	2011-05-24 11:46:20 UTC (rev 4998)
+++ base/trunk/mpulsweb/templates/casebundle/standin.mako	2011-05-24 13:51:15 UTC (rev 4999)
@@ -46,6 +46,14 @@
     </tr>
     <% idset = not idset %>
   % endfor
+  % if len(c.group_list) <= 0:
+    <tr>
+      <td colspan="2">
+        ${_('No data found.')}
+      </td>
+    </tr>
+  % endif
+
 </table>
 <input type="submit" value="${_('Change Standin')}">
 </form>