Author: nunofsantos Date: 2008-09-05 17:32:24 -0400 (Fri, 05 Sep 2008) New Revision: 2428 Modified: mgmt/trunk/cumin/python/cumin/job.py mgmt/trunk/cumin/python/cumin/model.py Log: adapt Jobs to use sourceObjectId instead of idOriginal as id/name Modified: mgmt/trunk/cumin/python/cumin/job.py =================================================================== --- mgmt/trunk/cumin/python/cumin/job.py 2008-09-05 21:07:03 UTC (rev 2427) +++ mgmt/trunk/cumin/python/cumin/job.py 2008-09-05 21:32:24 UTC (rev 2428) @@ -231,7 +231,7 @@ return self.frame.get_args(session) def render_title(self, session, job): - return "Hold Job '%d'" % job.idOriginal + return "Hold Job '%d'" % job.sourceObjectId def process_submit(self, session, job): action = self.app.model.job.hold @@ -240,7 +240,7 @@ self.process_cancel(session, job) def render_submit_content(self, session, job): - return "Yes, Hold Job '%d'" % job.idOriginal + return "Yes, Hold Job '%d'" % job.sourceObjectId def render_cancel_content(self, session, job): return "No, Cancel" @@ -250,7 +250,7 @@ return self.frame.get_args(session) def render_title(self, session, job): - return "Remove Job '%d'" % job.idOriginal + return "Remove Job '%d'" % job.sourceObjectId def process_submit(self, session, job): action = self.app.model.job.remove @@ -259,7 +259,7 @@ self.process_cancel(session, job) def render_submit_content(self, session, job): - return "Yes, Remove Job '%d'" % job.idOriginal + return "Yes, Remove Job '%d'" % job.sourceObjectId def render_cancel_content(self, session, job): return "No, Cancel" @@ -269,7 +269,7 @@ return self.frame.get_args(session) def render_title(self, session, job): - return "Release Job '%d'" % job.idOriginal + return "Release Job '%d'" % job.sourceObjectId def process_submit(self, session, job): action = self.app.model.job.release @@ -278,7 +278,7 @@ self.process_cancel(session, job) def render_submit_content(self, session, job): - return "Yes, Release Job '%d'" % job.idOriginal + return "Yes, Release Job '%d'" % job.sourceObjectId def render_cancel_content(self, session, job): return "No, Cancel" Modified: mgmt/trunk/cumin/python/cumin/model.py =================================================================== --- mgmt/trunk/cumin/python/cumin/model.py 2008-09-05 21:07:03 UTC (rev 2427) +++ mgmt/trunk/cumin/python/cumin/model.py 2008-09-05 21:32:24 UTC (rev 2428) @@ -438,7 +438,7 @@ self.mint_stats_class = mint_stats_class - prop = CuminProperty(self, "idOriginal") + prop = CuminProperty(self, "sourceObjectId") prop.title = "Management ID" prop = CuminProperty(self, "creationTime")