Author: tmckay
Date: 2011-06-14 18:19:58 +0000 (Tue, 14 Jun 2011)
New Revision: 4814
Modified:
branches/clarity/cumin/python/cumin/task.py
branches/clarity/cumin/python/cumin/task.strings
Log:
Merge 4752 from trunk.
BZ698106
Modified: branches/clarity/cumin/python/cumin/task.py
===================================================================
--- branches/clarity/cumin/python/cumin/task.py 2011-06-14 18:18:51 UTC (rev 4813)
+++ branches/clarity/cumin/python/cumin/task.py 2011-06-14 18:19:58 UTC (rev 4814)
@@ -189,6 +189,9 @@
self.dismiss = IntegerParameter(app, "dismiss")
self.add_parameter(self.dismiss)
+
+ self.dismiss_all = BooleanParameter(app, "dismiss_all")
+ self.add_parameter(self.dismiss_all)
self.item_widget = TaskInvocationItem(app, "item")
self.add_child(self.item_widget)
@@ -201,15 +204,20 @@
super(TaskInvocationSet, self).do_process(session)
dismiss = self.dismiss.get(session)
-
+ dismiss_all = self.dismiss_all.get(session)
+
+ if(dismiss_all):
+ for invoc in self.get_items(session):
+ invoc.dismissed = True
+ self.dismiss_all.set(session, self.dismiss_all.default)
+
if dismiss:
- for invoc in self.get_items(session):
- if id(invoc) == dismiss:
- invoc.dismissed = True
- break
+ for invoc in self.get_items(session):
+ if id(invoc) == dismiss:
+ invoc.dismissed = True
+ break
+ self.dismiss.set(session, self.dismiss.default)
- self.dismiss.set(session, self.dismiss.default)
- #self.dismiss.unset(session)
def do_render(self, session):
items = self.get_items(session)
@@ -224,6 +232,11 @@
writer.write(self.item_widget.render(session, item))
return writer.to_string()
+
+ def render_dismiss_all_href(self, session):
+ branch = session.branch()
+ self.dismiss_all.set(branch, True)
+ return branch.marshal()
class TaskInvocationItem(Widget):
def render_icon_href(self, session, item):
Modified: branches/clarity/cumin/python/cumin/task.strings
===================================================================
--- branches/clarity/cumin/python/cumin/task.strings 2011-06-14 18:18:51 UTC (rev 4813)
+++ branches/clarity/cumin/python/cumin/task.strings 2011-06-14 18:19:58 UTC (rev 4814)
@@ -24,7 +24,7 @@
[TaskInvocationSet.html]
<div id="{id}" class="{class}">
- <!-- <a class="dismissall" href="">Dismiss all</a>
-->
+ <a class="dismissall" href="{dismiss_all_href}">Dismiss
all</a>
<ul>{items}</ul>
</div>
Show replies by date