[rhmessaging-commits] rhmessaging commits: r3064 - mgmt/trunk/cumin/python/cumin.

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2009-01-21 12:20:46 -0500 (Wed, 21 Jan 2009)
New Revision: 3064

Modified:
   mgmt/trunk/cumin/python/cumin/job.py
   mgmt/trunk/cumin/python/cumin/page.py
   mgmt/trunk/cumin/python/cumin/system.strings
Log:
Fix for app error when cancelling Job Hold/Release/Remove from main and system pages.

Modified: mgmt/trunk/cumin/python/cumin/job.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/job.py	2009-01-21 16:50:17 UTC (rev 3063)
+++ mgmt/trunk/cumin/python/cumin/job.py	2009-01-21 17:20:46 UTC (rev 3064)
@@ -340,6 +340,15 @@
         self.add_mode(self.view)
         self.set_view_mode(self.view)
 
+        self.jobs_hold = JobSetHold(app, "jobshold")
+        self.add_mode(self.jobs_hold)
+
+        self.jobs_release = JobSetRelease(app, "jobsrelease")
+        self.add_mode(self.jobs_release)
+
+        self.jobs_remove = JobSetRemove(app, "jobsremove")
+        self.add_mode(self.jobs_remove)
+
         self.system = SystemFrame(app, "system")
         self.add_mode(self.system)
 
@@ -424,7 +433,7 @@
         ids = self.parent.ids.get(session)
         self.parent.ids.clear(session)
 
-        href = self.app.main_page.main.pool.jobs_remove.get_href(session, ids)
+        href = self.frame.jobs_remove.get_href(session, ids)
         self.page.set_redirect_url(session, href)
         
     def render_content(self, session):
@@ -443,7 +452,7 @@
         ids = self.parent.ids.get(session)
         self.parent.ids.clear(session)
 
-        href = self.app.main_page.main.pool.jobs_hold.get_href(session, ids)
+        href = self.frame.jobs_hold.get_href(session, ids)
         self.page.set_redirect_url(session, href)
         
     def render_content(self, session):
@@ -462,7 +471,7 @@
         ids = self.parent.ids.get(session)
         self.parent.ids.clear(session)
 
-        href = self.app.main_page.main.pool.jobs_release.get_href(session, ids)
+        href = self.frame.jobs_release.get_href(session, ids)
         self.page.set_redirect_url(session, href)
         
     def render_content(self, session):
@@ -1173,6 +1182,12 @@
         else:
             super(JobReasonBulkActionForm, self).process_submit(session, *args)
 
+    def process_return(self, session, *args):
+        branch = session.branch()
+        self.frame.show_view(branch)
+        self.page.set_current_frame(branch, self.frame)
+        self.page.set_redirect_url(session, branch.marshal())
+
     def get_reason(self, session, verb):
         """ returns <verb> by username[: <user input reason>] """
         reason = [self.reason.get(session)]

Modified: mgmt/trunk/cumin/python/cumin/page.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/page.py	2009-01-21 16:50:17 UTC (rev 3063)
+++ mgmt/trunk/cumin/python/cumin/page.py	2009-01-21 17:20:46 UTC (rev 3064)
@@ -69,6 +69,15 @@
         self.brokers_remove = BrokerSetRemove(app, "brokersremove")
         self.add_mode(self.brokers_remove)
 
+        self.jobs_hold = JobSetHold(app, "jobshold")
+        self.add_mode(self.jobs_hold)
+
+        self.jobs_release = JobSetRelease(app, "jobsrelease")
+        self.add_mode(self.jobs_release)
+
+        self.jobs_remove = JobSetRemove(app, "jobsremove")
+        self.add_mode(self.jobs_remove)
+
         action = self.app.model.broker_group.remove_set
         item = BrokerGroupParameter(app, "item")
         self.broker_groups_remove = CuminSetActionForm \

Modified: mgmt/trunk/cumin/python/cumin/system.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/system.strings	2009-01-21 16:50:17 UTC (rev 3063)
+++ mgmt/trunk/cumin/python/cumin/system.strings	2009-01-21 17:20:46 UTC (rev 3064)
@@ -158,12 +158,6 @@
   <div class="rfloat">{phase}</div>
 <form id="{id}" style="clear:right;" method="post" action="?">
 
-	  <div class="sactions">
-	    {job_search}
-	    <h2>Act on Selected Jobs:</h2>
-	    {hold} {release} {remove}
-	  </div>
-	
 	<table class="mobjects">
 	  <thead>
 	    <tr>