Changeset 112

Timestamp:

04/28/08 22:02:25 (7 months ago)

Author:

pragma

Message:

• Cascading deletion of categories, forums, topics, messages and watches
  

Files:

• trunk/tracforums/models/category.py (modified) (2 diffs)
• trunk/tracforums/models/forum.py (modified) (1 diff)
• trunk/tracforums/models/main.py (modified) (2 diffs)
• trunk/tracforums/models/message.py (modified) (1 diff)
• trunk/tracforums/models/topic.py (modified) (1 diff)
• trunk/tracforums/orm.py (modified) (4 diffs)

trunk/tracforums/models/category.py

@@ -8 +8 @@
-
-class CategoryModel(ORMSchema(
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-           
-           
-   
-   
-   
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+            
+            
+    
+    
+    
-    def demoteRank(self):
-        # increase rank value to lower it's priority in the list
@@ -47 +47 @@
-            self.rank = ranks[idx-1]
-            
+            
+    def deleteMany(self,query):
+        categoryIds = query.get("id")
+        
+        if categoryIds == None:
+            categoryIds = self.getBase().getColumnValues("id",query)
+            if len(categoryIds) == 0: return
+
+        from tracforums.models.forum import ForumModel
+        ForumModel(self.db,self).deleteMany({"categoryid":categoryIds})
+        
+        self.getBase().deleteMany(self,query)
+                          
+    def delete(self,data={}):        
+        from tracforums.models.forum import ForumModel
+        ForumModel(self.db,self).deleteMany({"categoryid":self.id})
+        
+        self.getBase().delete(self,data)
+        
+            
-
-CategoryModelWithForums = ORMSchema(

trunk/tracforums/models/forum.py

@@ -197 +197 @@
-            self.updateMany({"rank":ranks[idx-1]},{"rank":self.rank})
-            self.rank = ranks[idx-1]
+            
+    def deleteMany(self,query):
+        forumIds = query.get("id",query.get("forumid"))
+        
+        print 'forumIds',forumIds,query
+        
+        if forumIds == None:
+            forumIds = self.getBase().getColumnValues(self,"id",query)
+            if len(forumIds) == 0: return
+
+        from tracforums.models.topic import TopicModel
+        TopicModel(self.db,self).deleteMany({"forumid":forumIds})
+        
+        from tracforums.models.watch import ForumWatchModel
+        ForumWatchModel(self.db,self).deleteMany({"forumid":forumIds})
+        
+        self.getBase().deleteMany(self,query)
+    
+    def delete(self,data={}):        
+        from tracforums.models.topic import TopicModel
+        TopicModel(self.db,self).deleteMany({"forumid":self.id})
+        
+        from tracforums.models.watch import ForumWatchModel
+        ForumWatchModel(self.db,self).deleteMany({"forumid":self.id})
+        
+        self.getBase().delete(self,data)
-            
-            

trunk/tracforums/models/main.py

@@ -81 +81 @@
-        
-        from tracforums.models.forum import ForumModel
+        from tracforums.models.topic import TopicModel
+        from tracforums.models.message import MessageModel
-        from tracforums.models.category import CategoryModel
-
@@ -157 +159 @@
-                if len(selectedForums) > 0:
-                    ForumModel(self.db,self).deleteMany({"id":selectedForums,"projectid":self.getProjectId()})
+                    
-                if len(selectedCategories) > 0:
-
+                  
-                                    
-            elif action == "coalesceForums":

trunk/tracforums/models/message.py

@@ -106 +106 @@
-        elif self.formatContext.getAuthname() == self.author: return True
-        else: return self.formatContext.getAuthname() in self.topic.forum.moderators
-
+
+
-
-class MessageModelWithProfile(ORMSchema(

trunk/tracforums/models/topic.py

@@ -148 +148 @@
-        notifyTopicChanged(self.db,self.formatContext,self)
-        self.save(data)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-ProjectCorrelatedTopicModel = ORMSchema(

trunk/tracforums/orm.py

@@ -80 +80 @@
-        for i in range(0,len(part)):
-            keyname = prefix + parentKey +  str(i)
-val
+part
-            listterms.append(parentKey + " = %(" + keyname + ")s")
+            
-        termSQL += "(" + " or ".join(listterms) + ")"
-        
@@ -656 +657 @@
-            if len(querySql) > 0: querySql = " where " + querySql
-            
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            
-                if limit > 0:
-
-
-
-
+
+
+
+
+
+
-                return map(lambda x:x[0],rows)
-            return []
@@ -698 +711 @@
-            cursor.execute("update " + self.schema.tablename + updateSql + querySql,queryData) 
-            
-
+,debug=False
-            cursor = self.db.cursor()
-            (querySql,queryData) = getSqlTerm(self.db,query)
-            querySql = " where " + querySql
-            
-#
+if debug: 
-            
-            cursor.execute(self.schema.deleteSQL + querySql,queryData)  
@@ -729 +742 @@
-                val = self.get(name)
-                if val != None:
-     
+
-            
-            if debug: print("selectValues:",self,selectValues,self.schema.columnNames)