Changeset 536

Timestamp:

10/10/08 12:23:43 (5 years ago)

Author:

aculapov

Message:

• permit relationships between ticket types

Location:

trunk/plugins/tickettypedsystem/ticketsystem

Files:

• relationship.py (modified) (2 diffs)
• tickettypes/parentticket.py (modified) (3 diffs)

trunk/plugins/tickettypedsystem/ticketsystem/relationship.py

@@ -173 +173 @@
     
     @classmethod
-    def get_parent(cls, env, son_id, type, db=None):
+    def get_parent(cls, env, son_id, type=None, db=None):
         if not db:
             db = env.get_db_cnx()
             
         cursor = db.cursor()
-        cursor.execute("SELECT parent_id "
-                       "FROM " + LinksModelProvider.TABLE + 
-                       " WHERE others = %s AND type=%s", (str(son_id), type))
-        row = cursor.fetchone()
+        if type :
+            cursor.execute("SELECT parent_id "
+                           "FROM " + LinksModelProvider.TABLE + 
+                           " WHERE others = %s AND type=%s", (str(son_id), type))
+        else :
+            cursor.execute("SELECT parent_id "
+                           "FROM " + LinksModelProvider.TABLE + 
+                           " WHERE others = %s", str(son_id))
+        rows = cursor.fetchall()
         cursor.close()
-        if row :
-            yield TypedTicket(env, int(row[0]))
+        if rows :
+            for row in rows :
+                yield TypedTicket(env, int(row[0]))
         else :
             yield None
@@ -268 +274 @@
             else :
                 return []
+        ret_list = []
         for rel_type in  relations.keys():
-            relations[rel_type] = [TypedTicket(self.env, int(id)) 
-                                   for id in relations[rel_type].others]
-        return relations
+            ret_list.extend([TypedTicket(self.env, int(id)) 
+                                   for id in relations[rel_type].others])
+        return ret_list
     
     def create_relationship(self, ticket, relation_type, to_resource):

trunk/plugins/tickettypedsystem/ticketsystem/tickettypes/parentticket.py

@@ -55 +55 @@
             for ticket in self.get_related_tickets(data['ticket']):
                 new_data['subtickets'].append(ticket.resource)
-            for ticket in TicketRelationship.get_parent(self.env, data['ticket'].id, self.get_ticket_type()):
+            for ticket in TicketRelationship.get_parent(self.env, data['ticket'].id):
                 if ticket :
                     new_data['parents'].append(ticket.resource)    
@@ -124 +124 @@
     def get_related_tickets(self, ticket):
         rel_sys = TicketRelationshipSystem(self.env)
-        return rel_sys.get_related_tickets(ticket, self.get_ticket_type())
+        return rel_sys.get_related_tickets(ticket)
 
     def add_relation(self, ticket, to_ticket):
@@ -138 +138 @@
     def get_ticket_type(self):
         """It returns the ticket type name. """
-        return 'checklist'
+        return ''
     
     def get_fields(self):