Changeset 1259

Timestamp:

01/08/04 17:33:27 (21 years ago)

Author:

jalet

Message:

Additionnal check to not create a circular printers group.

Location:

pykota/trunk/pykota

Files:

• storage.py (modified) (2 diffs)
• storages/ldapstorage.py (modified) (2 diffs)
• storages/pgstorage.py (modified) (2 diffs)

pykota/trunk/pykota/storage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.35  2004/01/08 16:33:27  jalet
+# Additionnal check to not create a circular printers group.
+#
 # Revision 1.34  2004/01/08 16:24:49  jalet
 # edpykota now supports adding printers to printer groups.
@@ -245 +248 @@
     def addPrinterToGroup(self, printer) :    
         """Adds a printer to a printer group."""
-        if printer not in self.parent.getParentPrinters(self) :
+        if (printer not in self.parent.getParentPrinters(self)) and (printer.ident != self.ident) :
             self.parent.writePrinterToGroup(self, printer)
         

pykota/trunk/pykota/storages/ldapstorage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.46  2004/01/08 16:33:27  jalet
+# Additionnal check to not create a circular printers group.
+#
 # Revision 1.45  2004/01/08 16:24:49  jalet
 # edpykota now supports adding printers to printer groups.
@@ -821 +824 @@
     def writePrinterToGroup(self, pgroup, printer) :
         """Puts a printer into a printer group."""
-        if (printer.ident not in pgroup.uniqueMember) and (printer.ident != pgroup.ident) :
+        if printer.ident not in pgroup.uniqueMember :
             fields = {
                        "uniqueMember" : pgroup.uniqueMember + [printer.ident]

pykota/trunk/pykota/storages/pgstorage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.30  2004/01/08 16:33:27  jalet
+# Additionnal check to not create a circular printers group.
+#
 # Revision 1.29  2004/01/08 16:24:49  jalet
 # edpykota now supports adding printers to printer groups.
@@ -510 +513 @@
     def writePrinterToGroup(self, pgroup, printer) :
         """Puts a printer into a printer group."""
-        self.doModify("INSERT INTO printergroupsmembers (groupid, printerid) VALUES (%s, %s);" % (self.doQuote(pgroup.ident), self.doQuote(printer.ident)))
+        children = []
+        result = self.doSearch("SELECT printerid FROM printergroupsmembers WHERE groupid=%s;" % self.doQuote(pgroup.ident))
+        if result :
+            for record in result :
+                children.append(record.get("printerid")) # TODO : put this into the database integrity rules
+        if printer.ident not in children :        
+            self.doModify("INSERT INTO printergroupsmembers (groupid, printerid) VALUES (%s, %s);" % (self.doQuote(pgroup.ident), self.doQuote(printer.ident)))
         
     def deleteUser(self, user) :