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

db/standard/zentao12.3.3.sql

@@ -388,6 +388,7 @@ CREATE TABLE `zt_file` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 CREATE TABLE `zt_group` (
   `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `program` mediumint(8) unsigned NOT NULL DEFAULT 0,
   `name` char(30) NOT NULL,
   `role` char(30) NOT NULL DEFAULT '',
   `desc` char(255) NOT NULL DEFAULT '',

db/update12.3.2.sql

@@ -4,3 +4,5 @@ DELETE FROM `zt_grouppriv` WHERE `module` = 'api' AND `method` = 'getModel';
 DELETE FROM `zt_grouppriv` WHERE `module` = 'api' AND `method` = 'sql';
 
 ALTER TABLE `zt_jenkins` CHANGE `password` `password` varchar(255) COLLATE 'utf8_general_ci' NOT NULL AFTER `account`;
+
+ALTER TABLE `zt_group` ADD `program` mediumint(8) unsigned NOT NULL DEFAULT 0 AFTER `id`;

db/zentao.sql

@@ -403,6 +403,7 @@ CREATE TABLE IF NOT EXISTS `zt_file` (
 -- DROP TABLE IF EXISTS `zt_group`;
 CREATE TABLE IF NOT EXISTS `zt_group` (
   `id` mediumint(8) unsigned NOT NULL auto_increment,
+  `program` mediumint(8) unsigned NOT NULL DEFAULT 0,
   `name` char(30) NOT NULL,
   `role` char(30) NOT NULL default '',
   `desc` char(255) NOT NULL default '',

module/common/view/datatable.fix.html.php

@@ -9,16 +9,21 @@ $(function()
     $('#sidebar .cell .text-center:last').append("<a href='#showModuleModal' data-toggle='modal' class='btn btn-info btn-wide'><?php echo $lang->datatable->moduleSetting?></a><hr class='space-sm' />");
     <?php endif;?>
 
-    var $btnToolbar = $('#main .table-header .btn-toolbar:first');
-    if($btnToolbar.length > 0)
+    var addSettingButton = function()
     {
-        <?php $mode = isset($config->datatable->$datatableId->mode) ? $config->datatable->$datatableId->mode : 'table';?>
-        var $dropdown = $('<div class="dropdown"><button id="tableCustomBtn" type="button" class="btn btn-link" data-toggle="dropdown"><i class="icon-cog"></i></button></div>');
-        var $dropmenu = $('<ul class="dropdown-menu pull-right"></ul>');
-        $dropmenu.append("<li><a href='<?php echo $this->createLink('datatable', 'ajaxCustom', 'id=' . $this->moduleName . '&method=' . $this->methodName)?>' data-toggle='modal' data-type='ajax'><?php echo $lang->datatable->custom?></a></li>");
-        $dropmenu.append("<li><a href='javascript:saveDatatableConfig(\"mode\", \"<?php echo $mode == 'table' ? 'datatable' : 'table';?>\", true);' id='switchToDatatable'><?php echo $mode == 'table' ? $lang->datatable->switchToDatatable : $lang->datatable->switchToTable;?></a></li>");
-        $dropdown.append($dropmenu).appendTo($btnToolbar);
-    }
+        var $btnToolbar = $('#main .table-header .btn-toolbar:first');
+        if($btnToolbar.length > 0)
+        {
+            <?php $mode = isset($config->datatable->$datatableId->mode) ? $config->datatable->$datatableId->mode : 'table';?>
+            var $dropdown = $('<div class="dropdown"><button id="tableCustomBtn" type="button" class="btn btn-link" data-toggle="dropdown"><i class="icon-cog"></i></button></div>');
+            var $dropmenu = $('<ul class="dropdown-menu pull-right"></ul>');
+            $dropmenu.append("<li><a href='<?php echo $this->createLink('datatable', 'ajaxCustom', 'id=' . $this->moduleName . '&method=' . $this->methodName)?>' data-toggle='modal' data-type='ajax'><?php echo $lang->datatable->custom?></a></li>");
+            $dropmenu.append("<li><a href='javascript:saveDatatableConfig(\"mode\", \"<?php echo $mode == 'table' ? 'datatable' : 'table';?>\", true);' id='switchToDatatable'><?php echo $mode == 'table' ? $lang->datatable->switchToDatatable : $lang->datatable->switchToTable;?></a></li>");
+            $dropdown.append($dropmenu).appendTo($btnToolbar);
+        }
+    };
+    $('#main .main-table').on('tableReload', addSettingButton);
+    addSettingButton();
 
     $('#setShowModule').click(function()
     {
@@ -31,12 +36,12 @@ $(function()
         {
             type: "POST",
             dataType: 'json',
-            data: 
+            data:
             {
-                target: datatableId, 
-                name: 'showModule', 
-                value: value, 
-                allModule: allModule, 
+                target: datatableId,
+                name: 'showModule',
+                value: value,
+                allModule: allModule,
             },
             success:function(){window.location.reload();},
             url: '<?php echo $this->createLink('datatable', 'ajaxSave')?>'
@@ -72,12 +77,12 @@ $(function()
       <div class="modal-body">
         <form class='form-condensed' method='post' target='hiddenwin' action='<?php echo $this->createLink('datatable', 'ajaxSave')?>'>
           <table class='table table-form'>
-            <tr> 
+            <tr>
               <td class='w-150px'><?php echo $lang->datatable->showModule;?></td>
               <td><?php echo html::radio('showModule', $lang->datatable->showModuleList, isset($config->datatable->$datatableId->showModule) ? $config->datatable->$datatableId->showModule : '');?></td>
             </tr>
             <?php if($app->moduleName == 'project' && $app->methodName == 'task'):?>
-            <tr> 
+            <tr>
               <td><?php echo $lang->datatable->showAllModule;?></td>
               <td><?php echo html::radio('showAllModule', $lang->datatable->showAllModuleList, isset($config->project->task->allModule) ? $config->project->task->allModule : 0);?></td>
             </tr>