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

Author: eallen Date: 2008-12-18 18:24:18 -0500 (Thu, 18 Dec 2008) New Revision: 3030 Modified: mgmt/trunk/cumin/python/cumin/job.py mgmt/trunk/cumin/python/cumin/job.strings Log: Make job output area non-disabled so copy works. Change the "loading..." message if there are no valid file names in the job ad. Modified: mgmt/trunk/cumin/python/cumin/job.py =================================================================== --- mgmt/trunk/cumin/python/cumin/job.py 2008-12-18 22:38:27 UTC (rev 3029) +++ mgmt/trunk/cumin/python/cumin/job.py 2008-12-18 23:24:18 UTC (rev 3030) @@ -887,6 +887,10 @@ return super(JobOutput, self).render(session, *args) + def render_loading(self, session, *args): + file = self.which_file.get_current_file_name(session) + return file and "loading..." or "Output, Error, and UserLog file names are invalid." + def get_file_args(self, session): first_last = self.first_last.get(session) if first_last == "t": @@ -903,10 +907,11 @@ job = self.parent.frame.get_args(session)[0] if job: file, start, end = self.parent.get_file_args(session) - fl = self.parent.first_last.get(session) - args = "%s&%i&%i&%s" % (file, start, end, fl) - args = escape_amp(args) - return "call.xml?class=job;id=%i;method=fetch;xargs=%s" % (job.id, args) + if file: + fl = self.parent.first_last.get(session) + args = "%s&%i&%i&%s" % (file, start, end, fl) + args = escape_amp(args) + return "call.xml?class=job;id=%i;method=fetch;xargs=%s" % (job.id, args) def do_render(self, session): return self.render_script(session) Modified: mgmt/trunk/cumin/python/cumin/job.strings =================================================================== --- mgmt/trunk/cumin/python/cumin/job.strings 2008-12-18 22:38:27 UTC (rev 3029) +++ mgmt/trunk/cumin/python/cumin/job.strings 2008-12-18 23:24:18 UTC (rev 3030) @@ -385,8 +385,8 @@ {file} </div> <div class="sactions refresh_info">{refresh} <h2>Last refresh was at <span id="out_time"></span></h2></div> -<div><textarea name="job_output" id="job_output" disabled="disabled" rows="20" cols="80"> -loading...{job_output} +<div><textarea name="job_output" id="job_output" rows="20" cols="80"> +{loading}{job_output} </textarea> {hidden_inputs}</div> </form>