r5468 - in branches/vmotoska/cumin/python/cumin: grid users

vmotoska at fedoraproject.org vmotoska at fedoraproject.org
Wed Sep 12 14:56:16 UTC 2012


Author: vmotoska
Date: 2012-09-12 14:56:14 +0000 (Wed, 12 Sep 2012)
New Revision: 5468

Modified:
   branches/vmotoska/cumin/python/cumin/grid/job.py
   branches/vmotoska/cumin/python/cumin/users/widgets.py
Log:
delete functionality, grid/job syntax error ? 

Modified: branches/vmotoska/cumin/python/cumin/grid/job.py
===================================================================
--- branches/vmotoska/cumin/python/cumin/grid/job.py	2012-09-12 13:14:27 UTC (rev 5467)
+++ branches/vmotoska/cumin/python/cumin/grid/job.py	2012-09-12 14:56:14 UTC (rev 5468)
@@ -766,10 +766,9 @@
             if "property" in item:
                 if item["name"] == "JobStatus":
                     status = item["value"]
-                    if JobStatusInfo.get_status_string(status) in {"Completed",
-                                                                   "Removed"}:
+                    if JobStatusInfo.get_status_string(status) in ["Completed", "Removed"]:
                         render = False
-                    break                   
+                    break
         return render and not error and self.edit_button.render(session) or ""
 
     def render_title(self, session):

Modified: branches/vmotoska/cumin/python/cumin/users/widgets.py
===================================================================
--- branches/vmotoska/cumin/python/cumin/users/widgets.py	2012-09-12 13:14:27 UTC (rev 5467)
+++ branches/vmotoska/cumin/python/cumin/users/widgets.py	2012-09-12 14:56:14 UTC (rev 5468)
@@ -3,7 +3,6 @@
 from crypt import crypt
 from random import sample
 
-from cumin.objectselector import ObjectSelector, ObjectLinkColumn, ObjectTable, ObjectTableColumn
 from cumin.objectframe import ObjectFrame
 
 from cumin.sqladapter import ObjectSqlAdapter
@@ -76,7 +75,7 @@
         if len(data) > 0:
             for userrow in data:
                 user_record = list(userrow)
-                tmp_res = [user_record[0],user_record[1],user_record[2],user_record[3],user_record[4],'']
+                tmp_res = [user_record[2],user_record[1],user_record[2],user_record[3],user_record[4],user_record[5]]
                 added = False
                 for i,r in enumerate(res):
                     if r[1] == user_record[1]:
@@ -101,14 +100,45 @@
         return len(self.get_data(values,options))
 
 
-class UsersRemove(ObjectSelectorTask):
+class UsersRemoveTask(ObjectSelectorTask):
+    def __init__(self, app, selector):
+        super(UsersRemoveTask, self).__init__(app, selector)
+        self.cls = app.model.com_redhat_cumin.User
+        self.selector = selector
+        self.form = UserRemoveTaskForm(app, self.name, self)
+
     def get_title(self, session):
         return "Remove"
 
+    def do_invoke(self, invoc, items):
+        invoc.end()
+
     def do_exit(self, session):
         self.app.main_page.main.users.view.show(session)
 
 
+class UserRemoveTaskForm(ObjectSelectorTaskForm):
+    def __init__(self, app, name, task):
+        super(UserRemoveTaskForm, self).__init__(app, name, task)
+        self.cls = task.cls
+        self.task = task
+
+#    def do_process(self, session):
+#        log.debug("-----%s",self.get_selection(session))
+#        super(UserRemoveTaskForm, self).do_process(session)
+
+
+    def process_submit(self, session):
+        if self.get_selection(session) == 0:
+            self.cancel(session)
+        for i in self.selection.get(session):
+            i.delete(session.cursor)
+
+        super(UserRemoveTaskForm, self).process_submit(session)
+
+    def render_title(self, session):
+        return "Remove user:"
+
 class UsersSelector(ObjectSelector):
     def __init__(self, app, name):
         cls = app.model.com_redhat_cumin.UserRoleMapping
@@ -119,7 +149,6 @@
         self.table.adapter = UserDataAdapter(app)
         frame = "main.users.userdetail"
         col = UsernameSearchColumn(app, "name", user_cls.name, user_cls._id, frame)
-
         ext_col = ExternalUserColumn(app, "external", user_cls.password ) 
         mob_col = MobileUserColumn(app, "mobile", user_cls.pin)
         rol_col = UserRoleAssignmentColumn(app, "roles",role_cls.name) 
@@ -128,7 +157,7 @@
         self.add_column(ext_col)
         self.add_column(mob_col)
         self.add_search_filter(col)
-        self.remove = UsersRemove(app, self)
+        self.remove = UsersRemoveTask(app, self)
 
         self.links.add_child(AddUserLink(app, "adduser"))
 



More information about the cumin-developers mailing list