r4820 - branches/clarity/cumin/resources
by tmckay＠fedoraproject.org
Author: tmckay
Date: 2011-06-14 18:43:13 +0000 (Tue, 14 Jun 2011)
New Revision: 4820
Modified:
branches/clarity/cumin/resources/app.css
Log:
Merge 4772 from trunk.
BZ703630
Modified: branches/clarity/cumin/resources/app.css
===================================================================
--- branches/clarity/cumin/resources/app.css 2011-06-14 18:40:31 UTC (rev 4819)
+++ branches/clarity/cumin/resources/app.css 2011-06-14 18:43:13 UTC (rev 4820)
@@ -511,8 +511,8 @@
float: right;
z-index: 4;
position: absolute;
- top: -2px;
- right: 4px;
+ top: 27px;
+ right: 60px;
display: none;
}
div.fullpageable:hover div.fullpageTitle,
12 years, 10 months
r4818 - branches/clarity/cumin/bin
by tmckay＠fedoraproject.org
Author: tmckay
Date: 2011-06-14 18:38:54 +0000 (Tue, 14 Jun 2011)
New Revision: 4818
Modified:
branches/clarity/cumin/bin/cumin
Log:
Merge 4770 from trunk.
BZ674598
Modified: branches/clarity/cumin/bin/cumin
===================================================================
--- branches/clarity/cumin/bin/cumin 2011-06-14 18:35:09 UTC (rev 4817)
+++ branches/clarity/cumin/bin/cumin 2011-06-14 18:38:54 UTC (rev 4818)
@@ -5,6 +5,7 @@
import os
import sys
import signal
+import traceback
home = os.environ.get("CUMIN_HOME", os.path.normpath("/usr/share/cumin"))
sys.path.append(os.path.join(home, "python"))
@@ -53,42 +54,45 @@
PROG_STRING = 2
config = CuminMasterConfig()
- values = config.parse().master
- parser = OptionParser()
+ # Trap exit from parser and save standard error for logging
+ # Then put stderr back to original value
+ r, w = os.pipe()
+ sys.stderr = os.fdopen(w,"w")
+ try:
+ values = config.parse().master
- parser.add_option("--init-only", dest="init_only", action="store_true", default=False,
- help="Check options and initialization, then return.")
+ parser = OptionParser()
- parser.add_option("--webs", dest="webs", default=values.webs,
- help="Configuration section names for cumin-web instances."\
- "\nEach value implies a separate cumin-web instance.")
+ parser.add_option("--init-only", dest="init_only", action="store_true", default=False,
+ help="Check options and initialization, then return.")
- parser.add_option("--datas", dest="datas", default=values.datas,
- help="Configuration section names for cumin-data instances."\
- "\nEach value implies a separate cumin-data instance.")
+ parser.add_option("--webs", dest="webs", default=values.webs,
+ help="Configuration section names for cumin-web instances."\
+ "\nEach value implies a separate cumin-web instance.")
- parser.add_option("--console", dest="console", action="store_true", default=False,
- help="Log to stderr rather than master.log, no IO redirection for children.")
+ parser.add_option("--datas", dest="datas", default=values.datas,
+ help="Configuration section names for cumin-data instances."\
+ "\nEach value implies a separate cumin-data instance.")
- parser.add_option("--data_options", dest="data_options", default="", type=str,
- help="Additional options string to pass to data instances."\
- "\nEnclose in quotes, options must be --option form, splits on spaces."\
- '\nExample: data_options="--print-events=5 --print-stats"')
+ parser.add_option("--console", dest="console", action="store_true", default=False,
+ help="Log to stderr rather than master.log, no IO redirection for children.")
- parser.add_option("--web_options", dest="web_options", default="", type=str,
- help="Additional options string to pass to web instances."\
- "\nEnclose in quotes, options must be --option form, splits on spaces."\
- '\nExample: web_options="--debug --port=12345"')
+ parser.add_option("--data_options", dest="data_options", default="", type=str,
+ help="Additional options string to pass to data instances."\
+ "\nEnclose in quotes, options must be --option form, splits on spaces."\
+ '\nExample: data_options="--print-events=5 --print-stats"')
- # Trap exit from parser and save standard error for logging
- # Then put stderr back to original value
- r, w = os.pipe()
- sys.stderr = os.fdopen(w,"w")
- try:
+ parser.add_option("--web_options", dest="web_options", default="", type=str,
+ help="Additional options string to pass to web instances."\
+ "\nEnclose in quotes, options must be --option form, splits on spaces."\
+ '\nExample: web_options="--debug --port=12345"')
(options, args) = parser.parse_args()
+ except SystemExit:
+ options = args = None
except:
options = args = None
+ traceback.print_exc()
sys.stderr.close()
sys.stderr = sys.__stderr__
12 years, 10 months
r4817 - branches/clarity/cumin/python/cumin/grid
by tmckay＠fedoraproject.org
Author: tmckay
Date: 2011-06-14 18:35:09 +0000 (Tue, 14 Jun 2011)
New Revision: 4817
Modified:
branches/clarity/cumin/python/cumin/grid/job.py
Log:
Merge 4768-4769 from trunk.
BZ703196
Modified: branches/clarity/cumin/python/cumin/grid/job.py
===================================================================
--- branches/clarity/cumin/python/cumin/grid/job.py 2011-06-14 18:23:27 UTC (rev 4816)
+++ branches/clarity/cumin/python/cumin/grid/job.py 2011-06-14 18:35:09 UTC (rev 4817)
@@ -678,10 +678,12 @@
orig = float(orig)
if fval != orig:
if ftype == "string":
- quoted = "\"%s\"" % fval
+ quoted = "\"%s\"" % strip_string_quotes(fval)
if quoted == orig:
continue
- just_ads[unicode(field)] = fval
+ just_ads[unicode(field)] = quoted #string
+ else:
+ just_ads[unicode(field)] = fval
if not errors:
id = self.frame.id.get(session)
12 years, 10 months
r4816 - in branches/clarity/cumin: python/cumin/grid resources
by tmckay＠fedoraproject.org
Author: tmckay
Date: 2011-06-14 18:23:27 +0000 (Tue, 14 Jun 2011)
New Revision: 4816
Modified:
branches/clarity/cumin/python/cumin/grid/limit.py
branches/clarity/cumin/python/cumin/grid/limit.strings
branches/clarity/cumin/resources/app.css
Log:
Merge 4761 from trunk.
BZ697016
Modified: branches/clarity/cumin/python/cumin/grid/limit.py
===================================================================
--- branches/clarity/cumin/python/cumin/grid/limit.py 2011-06-14 18:21:53 UTC (rev 4815)
+++ branches/clarity/cumin/python/cumin/grid/limit.py 2011-06-14 18:23:27 UTC (rev 4816)
@@ -1,20 +1,23 @@
-import logging
-
from cumin.formats import fmt_link
from cumin.model import QmfCall
-from cumin.objectselector import ObjectTableColumn, ObjectQmfSelector,\
+from cumin.objectframe import ObjectFrame, ObjectFrameTask, \
+ ObjectFrameTaskFeedbackForm
+from cumin.objectselector import ObjectTableColumn, ObjectQmfSelector, \
ObjectQmfTable
-from cumin.objectframe import ObjectFrame, ObjectFrameTask,\
- ObjectFrameTaskFeedbackForm
from cumin.qmfadapter import ObjectQmfAdapter
from cumin.widgets import CuminView
-
-from wooly.forms import StringField, StringInput, IntegerField, RealField
+from wooly.forms import StringField, StringInput, IntegerField, RealField, \
+ FormButton, FormField, FormError
from wooly.util import StringCatalog
from wooly.widgets import TabbedModeSet
+from wooly.parameters import *
+import logging
+
+
strings = StringCatalog(__file__)
log = logging.getLogger("cumin.limit")
+LIMIT_FLOAT_VALUE_FOR_UNLIMITED = 1000000.0
class LimitAdapter(ObjectQmfAdapter):
def __init__(self, app, cls, collector):
@@ -104,7 +107,7 @@
limit_max = super(LimitTable.MaxColumn, self).render_cell_content(session, data)
try:
limit_max = float(limit_max)
- if limit_max > 1000000.0:
+ if limit_max >= LIMIT_FLOAT_VALUE_FOR_UNLIMITED:
limit_max = "Unlimited"
except:
limit_max = 0
@@ -177,13 +180,25 @@
self.limit_max = self.LimitMax(app, "max")
self.limit_max.required = True
self.add_field(self.limit_max)
+
+ self.reset_button = self.ResetLimitFormButton(app, "resetbutton")
+ self.add_field(self.reset_button)
+
+
def process_submit(self, session):
- self.validate(session)
+ new_max_value = self.limit_max.input.get(session)
+
+ self.limit_max.validate(session)
+ if not self.errors.get(session):
+ if new_max_value.lower() in ("unlimited", "na", "n/a") or float(new_max_value) >= LIMIT_FLOAT_VALUE_FOR_UNLIMITED:
+ self.limit_max.set(session, LIMIT_FLOAT_VALUE_FOR_UNLIMITED)
+ else:
+ self.limit_max.set(session,new_max_value)
if not self.errors.get(session):
limit_name = self.limit_name.get(session)
- limit_max = self.limit_max.get(session)
+ limit_max = self.limit_max.get_float_value(session)
negotiator = self.object.get(session)
self.task.invoke(session, negotiator, limit_name, limit_max)
@@ -192,6 +207,19 @@
def render_form_class(self, session):
return " ".join((super(NegotiatorLimitForm, self).render_form_class(session), "mform"))
+ class ResetLimitFormButton(FormField):
+ def __init__(self, app, name):
+ super(NegotiatorLimitForm.ResetLimitFormButton, self).__init__(app, name)
+ self.button_tmpl = WidgetTemplate(self, "reset_button_html")
+
+ def do_render(self, session):
+ writer = Writer()
+ self.button_tmpl.render(writer, session)
+ return writer.to_string()
+
+ def render_class(self, session):
+ return "midformbutton"
+
class LimitName(StringField):
def __init__(self, app, name):
super(NegotiatorLimitForm.LimitName, self).__init__(app, name)
@@ -206,10 +234,35 @@
# used to override html and css
pass
- class LimitMax(RealField):
+ class LimitMax(StringField):
def render_title(self, session):
return "Max Allowance"
-
+
+ def get(self,session):
+ # this gets the value for display
+ value = self.input.get(session)
+ if value >= LIMIT_FLOAT_VALUE_FOR_UNLIMITED:
+ value = "Unlimited"
+ return value
+
+ def get_float_value(self,session):
+ # this gets the value sent via QMF to reset the limit
+ value = self.input.get(session)
+ if float(value) >= LIMIT_FLOAT_VALUE_FOR_UNLIMITED:
+ value = LIMIT_FLOAT_VALUE_FOR_UNLIMITED
+ return value
+
+ def validate(self, session):
+ value = self.input.get(session)
+ if value:
+ try:
+ if value not in ("unlimited", "na", "n/a"):
+ value = float(value)
+ except:
+ title = self.render_title(session)
+ message = "The '%s' field must be either \"unlimited\", an integer or a float" % title
+ self.form.errors.add(session, FormError(message))
+
class LimitView(CuminView):
def __init__(self, app, name, limit):
super(LimitView, self).__init__(app, name, None)
Modified: branches/clarity/cumin/python/cumin/grid/limit.strings
===================================================================
--- branches/clarity/cumin/python/cumin/grid/limit.strings 2011-06-14 18:21:53 UTC (rev 4815)
+++ branches/clarity/cumin/python/cumin/grid/limit.strings 2011-06-14 18:23:27 UTC (rev 4816)
@@ -30,3 +30,17 @@
);
//]]>
</script>
+
+[ResetLimitFormButton.reset_button_html]
+<tr id="{id}">
+ <th></th>
+ <td><button class="{class}" type="button" name="{id}" onclick="return resetLimitMax();">Unlimited</button></td>
+</tr>
+<script type="text/javascript">
+//<![CDATA[
+function resetLimitMax() {
+ document.forms[0].elements[1].value="Unlimited";
+ return false;
+}
+//]]>
+</script>
Modified: branches/clarity/cumin/resources/app.css
===================================================================
--- branches/clarity/cumin/resources/app.css 2011-06-14 18:21:53 UTC (rev 4815)
+++ branches/clarity/cumin/resources/app.css 2011-06-14 18:23:27 UTC (rev 4816)
@@ -237,6 +237,10 @@
padding: 0.25em 0.25em 0 0.25em;
}
+form.mform button.midformbutton {
+ margin: 0em;
+}
+
form.mform a.help {
float: left;
margin: 0.5em;
12 years, 10 months
r4815 - in branches/clarity/cumin/python/cumin: . account
by tmckay＠fedoraproject.org
Author: tmckay
Date: 2011-06-14 18:21:53 +0000 (Tue, 14 Jun 2011)
New Revision: 4815
Modified:
branches/clarity/cumin/python/cumin/account/widgets.py
branches/clarity/cumin/python/cumin/account/widgets.strings
branches/clarity/cumin/python/cumin/main.py
branches/clarity/cumin/python/cumin/widgets.py
branches/clarity/cumin/python/cumin/widgets.strings
Log:
Merge 4753 from trunk.
BZ694827
Modified: branches/clarity/cumin/python/cumin/account/widgets.py
===================================================================
--- branches/clarity/cumin/python/cumin/account/widgets.py 2011-06-14 18:19:58 UTC (rev 4814)
+++ branches/clarity/cumin/python/cumin/account/widgets.py 2011-06-14 18:21:53 UTC (rev 4815)
@@ -35,9 +35,6 @@
self.settings = SettingsFrame(app, "main")
self.add_tab(self.settings)
- self.about = AboutFrame(app, "about")
- self.add_tab(self.about)
-
class SettingsFrame(Frame):
def __init__(self, app, name):
super(SettingsFrame, self).__init__(app, name)
@@ -64,42 +61,7 @@
def render_content(self, sessino):
return "Change password"
-class AboutFrame(Frame):
- def __init__(self, app, name):
- super(AboutFrame, self).__init__(app, name)
- content = AboutContent(app, "about_content")
- self.add_child(content)
- def render_title(self, session):
- return "About the console"
-
-class AboutContent(Widget):
- def __init__(self, app, name):
- super(AboutContent, self).__init__(app, name)
-
- self.version_string = ""
- self.version_local = False
-
- # Look for version info in our well-known file.
- version_path = os.path.join(self.app.home, "version")
- if os.path.isfile(version_path):
- # Permission errors or corrupt file always possible
- try:
- f = open(version_path)
- self.version_string = f.readline().strip()
- self.version_local = f.readline().strip() == "local"
- except:
- pass
-
- if len(self.version_string) == 0:
- self.version_string = "Version has not been set"
-
- def render_version(self, session):
- res = self.version_string
- if self.version_local:
- res += ", devel instance"
- return res
-
class LoginPage(HtmlPage):
def __init__(self, app, name):
super(LoginPage, self).__init__(app, name)
Modified: branches/clarity/cumin/python/cumin/account/widgets.strings
===================================================================
--- branches/clarity/cumin/python/cumin/account/widgets.strings 2011-06-14 18:19:58 UTC (rev 4814)
+++ branches/clarity/cumin/python/cumin/account/widgets.strings 2011-06-14 18:21:53 UTC (rev 4815)
@@ -76,9 +76,3 @@
<p class="login_invalid">The user name and password you entered do not
match any account.</p>
-[AboutContent.html]
-<div>
-<h3>Management console version</h3>
-{version}
-</div>
-
Modified: branches/clarity/cumin/python/cumin/main.py
===================================================================
--- branches/clarity/cumin/python/cumin/main.py 2011-06-14 18:19:58 UTC (rev 4814)
+++ branches/clarity/cumin/python/cumin/main.py 2011-06-14 18:21:53 UTC (rev 4815)
@@ -24,6 +24,7 @@
from wooly import Session
from cumin.stat import PieChartPage
+from cumin.widgets import AboutPage
strings = StringCatalog(__file__)
log = logging.getLogger("cumin")
@@ -73,7 +74,7 @@
# Space separated list of sasl authentication
# mechanisms, according to the sasl documentation
self.sasl_mech_list = None
-
+
def server_alive(self):
return self.server.server_alive()
@@ -171,6 +172,9 @@
self.export_page = CuminExportPage(self, "csv")
self.add_page(self.export_page)
+
+ self.about_page = AboutPage(self, "about.html")
+ self.add_page(self.about_page)
self.resource_page.protected = False
Modified: branches/clarity/cumin/python/cumin/widgets.py
===================================================================
--- branches/clarity/cumin/python/cumin/widgets.py 2011-06-14 18:19:58 UTC (rev 4814)
+++ branches/clarity/cumin/python/cumin/widgets.py 2011-06-14 18:21:53 UTC (rev 4815)
@@ -83,6 +83,11 @@
return branch.marshal()
else:
return super(CuminMainView, self).render_tab_href(session, tab)
+
+ def render_about_href(self, session):
+ page = self.app.about_page
+ lsess = Session(page)
+ return lsess.marshal()
class CuminPageLinks(ItemSet):
def __init__(self, app, name):
@@ -1622,3 +1627,57 @@
class TopTableFooter(Widget):
def render(self, session):
return ""
+
+class AboutPage(CuminPage, ModeSet):
+ def __init__(self, app, name):
+ super(AboutPage, self).__init__(app, name)
+
+ self.about = AboutMainView(app, "about")
+ self.add_mode(self.about)
+ self.set_default_frame(self.about)
+
+ def render_title(self, session):
+ return "About"
+
+class AboutFrame(Frame):
+ def __init__(self, app, name):
+ super(AboutFrame, self).__init__(app, name)
+ content = AboutContent(app, "about_content")
+ self.add_child(content)
+
+ def render_title(self, session):
+ return "About the console"
+
+class AboutMainView(CuminMainView):
+ def __init__(self, app, name):
+ super(AboutMainView, self).__init__(app, name)
+
+ self.about = AboutFrame(app, "about")
+ self.add_tab(self.about)
+
+class AboutContent(Widget):
+ def __init__(self, app, name):
+ super(AboutContent, self).__init__(app, name)
+
+ self.version_string = ""
+ self.version_local = False
+
+ # Look for version info in our well-known file.
+ version_path = os.path.join(self.app.home, "version")
+ if os.path.isfile(version_path):
+ # Permission errors or corrupt file always possible
+ try:
+ f = open(version_path)
+ self.version_string = f.readline().strip()
+ self.version_local = f.readline().strip() == "local"
+ except:
+ pass
+
+ if len(self.version_string) == 0:
+ self.version_string = "Version has not been set"
+
+ def render_version(self, session):
+ res = self.version_string
+ if self.version_local:
+ res += ", devel instance"
+ return res
Modified: branches/clarity/cumin/python/cumin/widgets.strings
===================================================================
--- branches/clarity/cumin/python/cumin/widgets.strings 2011-06-14 18:19:58 UTC (rev 4814)
+++ branches/clarity/cumin/python/cumin/widgets.strings 2011-06-14 18:21:53 UTC (rev 4815)
@@ -155,6 +155,8 @@
Hi, {user_name}
<span class="separator">|</span>
<a id="logout" onclick="wooly.clearUpdates()" href="{logout_href}">Log out</a>
+ <span class="separator">|</span>
+ <a href="{about_href}">About</a>
</div>
<div id="global">
@@ -901,3 +903,9 @@
[StaticColumnHeader.html]
<th class="{class}">{content}</th>
+[AboutContent.html]
+<div>
+<h3>Management console version</h3>
+{version}
+</div>
+
12 years, 10 months
r4814 - branches/clarity/cumin/python/cumin
by tmckay＠fedoraproject.org
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>
12 years, 10 months
r4813 - branches/clarity/cumin/python/cumin
by tmckay＠fedoraproject.org
Author: tmckay
Date: 2011-06-14 18:18:51 +0000 (Tue, 14 Jun 2011)
New Revision: 4813
Modified:
branches/clarity/cumin/python/cumin/charts.py
branches/clarity/cumin/python/cumin/stat.py
Log:
Merge 4751 from trunk.
BZ697093
Modified: branches/clarity/cumin/python/cumin/charts.py
===================================================================
--- branches/clarity/cumin/python/cumin/charts.py 2011-06-14 18:17:09 UTC (rev 4812)
+++ branches/clarity/cumin/python/cumin/charts.py 2011-06-14 18:18:51 UTC (rev 4813)
@@ -365,8 +365,8 @@
value = fraction * self.y_max - self.y_min
value = int(round(value + self.y_min))
- if value >= 10000000:
- svalue = "%im" % int(round(value / 1000000.0, -1))
+ if value >= 1000000:
+ svalue = "%.2fm" % (round(value / 1000000.0, 2))
elif value >= 10000:
svalue = "%ik" % int(round(value / 1000.0, -1))
else:
Modified: branches/clarity/cumin/python/cumin/stat.py
===================================================================
--- branches/clarity/cumin/python/cumin/stat.py 2011-06-14 18:17:09 UTC (rev 4812)
+++ branches/clarity/cumin/python/cumin/stat.py 2011-06-14 18:18:51 UTC (rev 4813)
@@ -939,8 +939,8 @@
if i % step == 0:
value = int(round(i * y_step, 0))
- if value >= 10000000:
- svalue = "%im" % int(round(value / 1000000.0, -1))
+ if value >= 1000000:
+ svalue = "%.2fm" % (round(value / 1000000.0, 2))
elif value >= 10000:
svalue = "%ik" % int(round(value / 1000.0, -1))
else:
12 years, 10 months
r4812 - branches/clarity/cumin/python/cumin
by tmckay＠fedoraproject.org
Author: tmckay
Date: 2011-06-14 18:17:09 +0000 (Tue, 14 Jun 2011)
New Revision: 4812
Modified:
branches/clarity/cumin/python/cumin/stat.py
Log:
Merge 4750 from trunk.
BZ699265
Modified: branches/clarity/cumin/python/cumin/stat.py
===================================================================
--- branches/clarity/cumin/python/cumin/stat.py 2011-06-14 17:43:40 UTC (rev 4811)
+++ branches/clarity/cumin/python/cumin/stat.py 2011-06-14 18:17:09 UTC (rev 4812)
@@ -1053,7 +1053,7 @@
if secs(dt) < min_dt:
break
- vals.reverse()
+ vals.sort(key=lambda stat: stat["dt"], reverse=False) #here, we sort by dt to be sure that our graphs are valid
return vals
def make_chart_lines(self, session, chart, line_type, stats, dot_size, halo_size, line_width, samples, duration, end_secs, mode):
12 years, 10 months
r4811 - branches
by tmckay＠fedoraproject.org
Author: tmckay
Date: 2011-06-14 17:43:40 +0000 (Tue, 14 Jun 2011)
New Revision: 4811
Added:
branches/clarity/
Log:
Clarity is obviously a virtue. Let's celebrate it.
12 years, 10 months
r4810 - trunk/cumin/python/cumin/grid
by croberts＠fedoraproject.org
Author: croberts
Date: 2011-06-13 19:38:26 +0000 (Mon, 13 Jun 2011)
New Revision: 4810
Modified:
trunk/cumin/python/cumin/grid/limit.py
Log:
Taking care of BZ: https://bugzilla.redhat.com/show_bug.cgi?id=712974 This involves removing the href from the "name" column on the limits table in favor of putting it on the Max column.
Modified: trunk/cumin/python/cumin/grid/limit.py
===================================================================
--- trunk/cumin/python/cumin/grid/limit.py 2011-06-13 18:55:39 UTC (rev 4809)
+++ trunk/cumin/python/cumin/grid/limit.py 2011-06-13 19:38:26 UTC (rev 4810)
@@ -74,14 +74,13 @@
self.frame.limit.id.set(session, negotiator._id)
self.frame.limit.set_limit.form.limit_name.set(session, limit_name)
self.frame.limit.set_limit.form.limit_max.set(session, limit_max)
- href = self.frame.limit.set_limit.get_href(session)
- return fmt_link(href, limit_name)
+ return limit_name
class UsageColumn(ObjectTableColumn):
def render_text_align(self, session):
return "right"
- class MaxColumn(ObjectTableColumn):
+ class MaxColumn(ObjectTableColumn):
def render_text_align(self, session):
return "right"
@@ -93,7 +92,8 @@
limit_max = "Unlimited"
except:
limit_max = 0
- return limit_max
+ href = self.frame.limit.set_limit.get_href(session)
+ return fmt_link(href, limit_max)
class LimitSelector(ObjectQmfSelector):
def __init__(self, app, name):
12 years, 10 months