Changeset 91

Timestamp:

03/26/08 22:06:04 (8 months ago)

Author:

pragma

Message:

Fixed visibility problem for guests on forum index

Files:

• trunk/tracforums/models/forum.py (modified) (2 diffs)
• trunk/tracforums/models/main.py (modified) (1 diff)

trunk/tracforums/models/forum.py

@@ -59 +59 @@
-                    
-    def format(self):
-        print """Custom Format""",self
-        self.canModify = toBool(self._canModify())
-        self.canAppend = toBool(self._canAppend())
@@ -67 +66 @@
-                
-    def _canView(self):
-User(): return False
+Guest(): return not self.hidden
-        elif self.formatContext.isForumAdmin(): return True
-        elif self.formatContext.getAuthname() in self.moderators: return True

trunk/tracforums/models/main.py

@@ -37 +37 @@
-        from tracforums.models.watch    import ProjectWatchModelWithProfile
-        
+        #filter visibiltiy for security
+        categoriesWithForums = []
+        for category in CategoryModelWithForums(self.db,self).getMany({"projectid": self.getProjectId()}):
+            categoryForums = []
+            for forum in category.forums:
+                if forum.canView: categoryForums.append(forum)
+            if len(categoryForums) > 0:
+                category.forums = categoryForums
+                categoriesWithForums.append(category)       
+        
+        #filter visibiltiy for security
+        plainForums = []
+        for forum in ForumModelWithRecentPost(self.db,self).getMany({"projectid": self.getProjectId(),"categoryid":0}):
+            if forum.canView: plainForums.append(forum)
+        
+        
-        return ("main/index.cs",{
-            "returnto": "main/index",
-            "validateErrors": validateErrors,
-            "canManage": self.isForumAdmin(),
-CategoryModelWithForums(self.db,self).getMany({"projectid": self.getProjectId()})
-ForumModelWithRecentPost(self.db,self).getMany({"projectid": self.getProjectId(),"categoryid":0})
+categoriesWithForums
+plainForums
-            "watching": ProjectWatchModelWithProfile(self.db,self).getMany({"projectid": self.getProjectId()}),
-        })