Changeset 34

Timestamp:

2008年07月30日 23时44分12秒 (4 years ago)

Author:

jiangx

Message:

See #7: New paginate strategy; add log_per_page to config file.

Location:

trunk/pysvnmanager

Files:

• config/DefaultConfig.py (modified) (1 diff)
• controllers/logs.py (modified) (1 diff)
• model/rcsbackup.py (modified) (3 diffs)

trunk/pysvnmanager/config/DefaultConfig.py

@@ -16 +16 @@
     # You can change authz_file in <deploy>.ini file.
     authz_file = config.get('authz_file', "") % {'here': config.get('here')}
+    
+    # Numbers of logs in each page.
+    log_per_page = 10
     
     # pysvnmanager authentication method.

trunk/pysvnmanager/controllers/logs.py

@@ -15 +15 @@
         self.rcslog = _rcs.RcsLog(cfg.authz_file)
         # Default logs per page is 10
-        self.rcslog.log_per_page = 1
+        self.rcslog.log_per_page = cfg.log_per_page
     
     def __before__(self, action):

trunk/pysvnmanager/model/rcsbackup.py

@@ -145 +145 @@
         else:
             # show last record on every page.
-            count = int( math.ceil( (self.__total -1 ) / self.__log_per_page ) )
+            #count = int( math.ceil( (self.__total -1 ) / self.__log_per_page ) )
+            count = int( math.ceil( (self.__total -2 ) / (self.__log_per_page - 1) ) )
 
         return count
@@ -171 +172 @@
     def __set_log_per_page(self, count):
         count = int(count)
-        if count <=0:
-            count = 10
+        if count < 2:
+            count = 2
         self.__log_per_page = count
 
@@ -216 +217 @@
         rev0=int(heads[1])
         
-        rev2 = rev0 - ((pagenum-1) * self.__log_per_page) -1
+        rev2 = rev0 - ((pagenum-1) * (self.__log_per_page-1)) -1
         if rev2<1: rev2=1
         rev1 = rev2 - self.__log_per_page + 1