[rhmessaging-commits] rhmessaging commits: r4145 - in mgmt/newdata/cumin: python/cumin/grid and 3 other directories.
rhmessaging-commits at lists.jboss.org
rhmessaging-commits at lists.jboss.org
Thu Jul 22 16:43:10 EDT 2010
Author: justi9
Date: 2010-07-22 16:43:09 -0400 (Thu, 22 Jul 2010)
New Revision: 4145
Modified:
mgmt/newdata/cumin/python/cumin/grid/job.py
mgmt/newdata/cumin/python/cumin/messaging/brokergroup.py
mgmt/newdata/cumin/python/cumin/messaging/main.py
mgmt/newdata/cumin/python/cumin/objectselector.py
mgmt/newdata/cumin/python/cumin/objectselector.strings
mgmt/newdata/cumin/python/cumin/objecttask.py
mgmt/newdata/cumin/python/cumin/objecttask.strings
mgmt/newdata/cumin/python/cumin/usergrid/widgets.py
mgmt/newdata/cumin/python/cumin/usergrid/widgets.strings
mgmt/newdata/cumin/resources/app.css
Log:
* Incorporate Ernie's patch for ObjectSelector links
* Handle job frame location in a way that's compatible with reuse in
the admin and user grid UIs
* Adjust styling for ObjectSelector links
* Filter grid user submissions by user
* Rename the task link and button widgets
Modified: mgmt/newdata/cumin/python/cumin/grid/job.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/grid/job.py 2010-07-22 17:08:58 UTC (rev 4144)
+++ mgmt/newdata/cumin/python/cumin/grid/job.py 2010-07-22 20:43:09 UTC (rev 4145)
@@ -177,7 +177,8 @@
class JobIdColumn(ObjectLinkColumn):
def render_cell_href(self, session, record):
job_id = record[self.parent.job_id_column.field.index]
- frame = self.page.page_widgets_by_path[self.frame_path]
+ #frame = self.page.page_widgets_by_path[self.frame_path]
+ frame = self.table.frame.job
submission = self.parent.submission.get(session)
return frame.get_href(session, submission._id, job_id)
Modified: mgmt/newdata/cumin/python/cumin/messaging/brokergroup.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/messaging/brokergroup.py 2010-07-22 17:08:58 UTC (rev 4144)
+++ mgmt/newdata/cumin/python/cumin/messaging/brokergroup.py 2010-07-22 20:43:09 UTC (rev 4145)
@@ -30,6 +30,10 @@
self.remove = BrokerGroupSelectionRemove(app, self)
+ task = BrokerGroupAdd(app)
+ link = TaskLink(app, "brokergroupadd", task)
+ self.links.add_child(link)
+
class BrokerGroupSelectionRemove(SelectionTask):
def get_title(self, session):
return "Remove"
Modified: mgmt/newdata/cumin/python/cumin/messaging/main.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/messaging/main.py 2010-07-22 17:08:58 UTC (rev 4144)
+++ mgmt/newdata/cumin/python/cumin/messaging/main.py 2010-07-22 20:43:09 UTC (rev 4145)
@@ -37,12 +37,10 @@
self.add_mode(self.broker)
self.add_sticky_view(self.broker)
- self.brokergroup = BrokerGroupFrame(app, "brokergroup")
- self.add_mode(self.brokergroup)
+ self.broker_group = BrokerGroupFrame(app, "brokergroup")
+ self.add_mode(self.broker_group)
- self.add_group = BrokerGroupAdd(app)
self.tasks = list()
- self.tasks.append(self.add_group)
def init(self):
super(MessagingFrame, self).init()
@@ -57,7 +55,7 @@
def __init__(self, app, name):
super(MessagingView, self).__init__(app, name)
- heading = self.MessageViewHeading(app, "heading")
+ heading = self.Heading(app, "heading")
self.add_child(heading)
self.tabs = TabbedModeSet(app, "tabs")
@@ -66,23 +64,9 @@
self.tabs.add_tab(BrokerBrowser(app, "brokers"))
self.tabs.add_tab(BrokerGroupSelector(app, "brokergroups"))
- class MessageViewHeading(CuminSummary):
- def __init__(self, app, name):
- super(MessagingView.MessageViewHeading, self).__init__(app, name, None)
-
- self.tasks = self.SummaryTasks(app, "tasks")
- self.replace_child(self.tasks)
-
- props = Widget(app, "properties")
- self.replace_child(props)
-
+ class Heading(CuminHeading):
def render_title(self, session):
return "Messaging"
def render_icon_href(self, session):
return "resource?name=broker-36.png"
-
- class SummaryTasks(ActionSet):
- def do_get_items(self, session):
- return [(x.get_href(session), x.get_title(session), True)
- for x in self.frame.tasks]
Modified: mgmt/newdata/cumin/python/cumin/objectselector.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/objectselector.py 2010-07-22 17:08:58 UTC (rev 4144)
+++ mgmt/newdata/cumin/python/cumin/objectselector.py 2010-07-22 20:43:09 UTC (rev 4145)
@@ -99,6 +99,9 @@
self.buttons = ObjectSelectorButtons(app, "buttons")
self.add_child(self.buttons)
+ self.links = ObjectSelectorLinks(app, "links")
+ self.add_child(self.links)
+
self.tasks = list()
def init(self):
@@ -108,7 +111,7 @@
task.init()
for task in self.tasks:
- button = SelectionTaskButton(self.app, task)
+ button = TaskButton(self.app, task)
self.buttons.add_child(button)
button.init()
@@ -215,3 +218,6 @@
class ObjectSelectorButtons(ObjectSelectorControl):
pass
+
+class ObjectSelectorLinks(ObjectSelectorControl):
+ pass
Modified: mgmt/newdata/cumin/python/cumin/objectselector.strings
===================================================================
--- mgmt/newdata/cumin/python/cumin/objectselector.strings 2010-07-22 17:08:58 UTC (rev 4144)
+++ mgmt/newdata/cumin/python/cumin/objectselector.strings 2010-07-22 20:43:09 UTC (rev 4145)
@@ -24,8 +24,14 @@
display: inline;
}
+div.ObjectSelectorLinks {
+ margin: 0 0 1em 0;
+}
+
[ObjectSelector.html]
<div id="{id}" class="{class}">
+ {links}
+
{filters}
{switches}
Modified: mgmt/newdata/cumin/python/cumin/objecttask.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/objecttask.py 2010-07-22 17:08:58 UTC (rev 4144)
+++ mgmt/newdata/cumin/python/cumin/objecttask.py 2010-07-22 20:43:09 UTC (rev 4145)
@@ -37,6 +37,11 @@
def get_href(self, session):
return self.enter(session).marshal()
+ def enter(self, session):
+ log.debug("Entering %s", self)
+
+ return session
+
def exit(self, session):
log.debug("Exiting %s", self)
@@ -405,11 +410,11 @@
def render_item_class(self, session, item):
return "item"
-class ObjectTaskLink(Link):
+class TaskLink(Link):
def __init__(self, app, name, task):
- assert isinstance(task, ObjectTask), task
+ assert isinstance(task, Task), task
- super(ObjectTaskLink, self).__init__(app, name)
+ super(TaskLink, self).__init__(app, name)
self.task = task
@@ -419,9 +424,9 @@
def render_content(self, session):
return self.task.get_title(session)
-class SelectionTaskButton(FormButton):
+class TaskButton(FormButton):
def __init__(self, app, task):
- super(SelectionTaskButton, self).__init__(app, task.name)
+ super(TaskButton, self).__init__(app, task.name)
self.task = task
Modified: mgmt/newdata/cumin/python/cumin/objecttask.strings
===================================================================
--- mgmt/newdata/cumin/python/cumin/objecttask.strings 2010-07-22 17:08:58 UTC (rev 4144)
+++ mgmt/newdata/cumin/python/cumin/objecttask.strings 2010-07-22 20:43:09 UTC (rev 4145)
@@ -38,3 +38,14 @@
ul.SelectionList {
list-style: none;
}
+
+[TaskLink.css]
+a.TaskLink {
+ font-size: 0.9em;
+}
+
+a.TaskLink:before {
+ content: "\00BB \0020";
+ font-weight: bold;
+ color: #dc9f2e;
+}
Modified: mgmt/newdata/cumin/python/cumin/usergrid/widgets.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/usergrid/widgets.py 2010-07-22 17:08:58 UTC (rev 4144)
+++ mgmt/newdata/cumin/python/cumin/usergrid/widgets.py 2010-07-22 20:43:09 UTC (rev 4145)
@@ -82,20 +82,23 @@
self.user = user
- self.user_name = UserSubmissionSelector.UserName(self, "username")
- self.add_attribute(self.user_name)
+ cls = self.app.model.com_redhat_cumin.User
- #self.add_filter(self.user_name, self.cls.Owner)
+ self.add_filter(self.user, self.cls.Owner, cls.name)
frame = "main.submissions.submission"
col = ObjectLinkColumn(app, "name", self.cls.Name, self.cls._id, frame)
self.insert_column(1, col)
- class UserName(Attribute):
- def get(self, session):
- user = self.widget.user.get(session)
- return user.name
+ #task = SubmissionAdd(app) # XXX ugh, pool frame
+ task = NullTask(app)
+ link = TaskLink(app, "submissionadd", task)
+ self.links.add_child(link)
+class NullTask(Task):
+ def get_title(self, session):
+ return "Create submission"
+
class UserJobStatSet(NewStatSet):
def __init__(self, app, name, user):
super(UserJobStatSet, self).__init__(app, name)
Modified: mgmt/newdata/cumin/python/cumin/usergrid/widgets.strings
===================================================================
--- mgmt/newdata/cumin/python/cumin/usergrid/widgets.strings 2010-07-22 17:08:58 UTC (rev 4144)
+++ mgmt/newdata/cumin/python/cumin/usergrid/widgets.strings 2010-07-22 20:43:09 UTC (rev 4145)
@@ -15,13 +15,6 @@
</h2>
{jobs}
-
- <h2>
- <img src="resource?name=pool-20.png"/>
- Slots
- </h2>
-
- {slots}
</td>
<td>
</td>
Modified: mgmt/newdata/cumin/resources/app.css
===================================================================
--- mgmt/newdata/cumin/resources/app.css 2010-07-22 17:08:58 UTC (rev 4144)
+++ mgmt/newdata/cumin/resources/app.css 2010-07-22 20:43:09 UTC (rev 4145)
@@ -612,7 +612,7 @@
font-size: 0.9em;
}
-a.ObjectTaskLink.Cumin:before {
+a.TaskLink.Cumin:before {
content: "\00BB \0020";
font-weight: bold;
color: #dc9f2e;
More information about the rhmessaging-commits
mailing list