Merge branch 'master' of https://github.com/easysoft/zentaopms

db/update9.8.3.sql

@@ -1,5 +1,4 @@
 ALTER TABLE `zt_release` ADD `marker` enum('0','1') NOT NULL default '0' AFTER `name`;
 ALTER TABLE `zt_doc` ADD `collector` text NOT NULL AFTER `views`;
-ALTER TABLE `zt_doc` ADD `visitedDate` datetime NOT NULL AFTER `editedDate`;
 ALTER TABLE `zt_doclib` ADD `collector` text NOT NULL AFTER `main`;
 ALTER TABLE `zt_module` ADD `collector` text NOT NULL AFTER `owner`;

db/zentao.sql

@@ -260,7 +260,6 @@ CREATE TABLE IF NOT EXISTS `zt_doc` (
   `addedDate` datetime NOT NULL,
   `editedBy` varchar(30) NOT NULL,
   `editedDate` datetime NOT NULL,
-  `visitedDate` datetime NOT NULL,
   `acl` varchar(10) NOT NULL DEFAULT 'open',
   `groups` varchar(255) NOT NULL,
   `users` text NOT NULL,

module/doc/view/alllibs.html.php

@@ -54,7 +54,7 @@
           <?php endforeach;?>
         </div>
       </div>
-      <div class='table-footer'><?php echo $pager->show('right', 'pagerjs');?></div>
+      <div class='table-footer'><?php $pager->show('right', 'pagerjs');?></div>
     </div>
   </div>
 </div>

module/doc/view/browse.html.php

@@ -94,7 +94,7 @@ var browseType = '<?php echo $browseType;?>';
           </tbody>
         </table>
       </div>
-      <div class='table-footer'><?php echo $pager->show('right', 'pagerjs');?></div>
+      <div class='table-footer'><?php $pager->show('right', 'pagerjs');?></div>
     </div>
   </div>
   <?php endif;?>

module/doc/view/browsebygrid.html.php

@@ -43,6 +43,6 @@
         <?php endforeach;?>
       </div>
     </div>
-    <div class='table-footer'><?php echo $pager->show('right', 'pagerjs');?></div>
+    <div class='table-footer'><?php $pager->show('right', 'pagerjs');?></div>
   </div>
 </div>

module/doc/view/showfiles.html.php

@@ -143,7 +143,7 @@
         </div>
       </div>
       <?php endif?>
-      <div class='table-footer'><?php echo $pager->show('right', 'pagerjs');?></div>
+      <div class='table-footer'><?php $pager->show('right', 'pagerjs');?></div>
     </div>
   </div>
 </div>

module/project/view/story.html.php

@@ -239,7 +239,7 @@
           }
           ?>
         </div>
-        <?php echo $pager->show('right', 'pagerjs');?>
+        <?php $pager->show('right', 'pagerjs');?>
       </div>
       <?php endif;?>
     </form>

module/testsuite/view/library.html.php

@@ -243,7 +243,7 @@ js::set('flow',   $this->config->global->flow);
             <?php endif;?>
           </div>
         </div>
-        <?php echo $pager->show('right', 'pagerjs');?>
+        <?php $pager->show('right', 'pagerjs');?>
       </div>
       <?php endif;?>
     </form>

module/testsuite/view/view.html.php

@@ -136,7 +136,7 @@
             </div>
           </div>
           <?php endif;?>
-          <?php echo $pager->show('right', 'pagerjs');?>
+          <?php $pager->show('right', 'pagerjs');?>
         </div>
       </div>
       </form>

module/testtask/view/cases.html.php

@@ -126,7 +126,7 @@
           ?>
         </div>
         <?php endif;?>
-        <?php echo $pager->show('right', 'pagerjs');?>
+        <?php $pager->show('right', 'pagerjs');?>
       </div>
       <?php endif;?>
     </form>