Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

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

Browse Source
This commit is contained in:
wangyidong
2018-05-18 14:40:05 +08:00
parent d256a684c0 100447df61
commit 6ce2e2fef4
9 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update9.8.3.sql
-1
View File
@@ -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
-1
View File
@@ -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/bug/model.php
+2 -1
View File
@@ -2421,7 +2421,8 @@ class bugModel extends model
switch($id)
{
case 'id':
if($mode == 'table' && $canBatchAction)
//if($mode == 'table' && $canBatchAction)
if($canBatchAction)
{
echo html::checkbox('bugIDList', array($bug->id => sprintf('%03d', $bug->id)));
}
module/datatable/view/ajaxcustom.html.php
+2 -1
View File
@@ -194,7 +194,8 @@ $(function()
return sets;
}).get();
window.saveDatatableConfig('<?php echo $mode == 'table' ? 'tablecols' : 'cols';?>', setting, true, $('#global1').prop('checked') ? 1 : 0);
//window.saveDatatableConfig('<?php echo $mode == 'table' ? 'tablecols' : 'cols';?>', setting, true, $('#global1').prop('checked') ? 1 : 0);
window.saveDatatableConfig('<?php echo 'cols';?>', setting, true, $('#global1').prop('checked') ? 1 : 0);
});
$('#resetBtn').on("click", function()
module/doc/view/index.html.php
+1 -1
View File
@@ -170,7 +170,7 @@
</thead>
<tbody>
<?php foreach($myDocs as $doc):?>
<tr data-url="">
<tr data-url="<?php echo $this->createLink('doc', 'view', "docID={$doc->id}");?>">
<td class="c-name"><?php echo $doc->title;?></td>
<td class="c-user"><?php echo zget($users, $doc->addedBy);?></td>
<td class="c-datetime"><?php echo formatTime($doc->editedDate) ? formatTime($doc->editedDate, 'm-d H:i') : formatTime($doc->addedDate, 'm-d H:i');?></td>
module/doc/view/objectlibs.html.php
+1 -1
View File
@@ -52,7 +52,7 @@
<?php foreach($libs as $libID => $lib):?>
<?php if($libID == 'project' and $from != 'doc') continue;?>
<?php if(strpos($this->config->doc->custom->objectLibs, 'files') === false && $libID == 'files') continue;?>
<?php if(strpos($this->config->doc->custom->objectLibs, 'customFiles') === false && !$lib->main) continue;?>
<?php if(strpos($this->config->doc->custom->objectLibs, 'customFiles') === false && isset($lib->main) && !$lib->main) continue;?>
<?php $libLink = inlink('browse', "libID=$libID&browseType=all&param=0&orderBy=id_desc&from=$from");?>
<?php if($libID == 'project') $libLink = inlink('allLibs', "type=project&product=$object->id");?>
module/task/model.php
+2 -1
View File
@@ -2258,7 +2258,8 @@ class taskModel extends model
switch($id)
{
case 'id':
if($mode == 'table' && $canBatchAction)
//if($mode == 'table' && $canBatchAction)
if($canBatchAction)
{
echo html::checkbox('taskIDList', array($task->id => sprintf('%03d', $task->id)));
}
module/testcase/model.php
+2 -1
View File
@@ -1307,7 +1307,8 @@ class testcaseModel extends model
switch($id)
{
case 'id':
echo $mode == 'table' ? html::checkbox('caseIDList', array($case->id => sprintf('%03d', $case->id))) : sprintf('%03d', $case->id);
//echo $mode == 'table' ? html::checkbox('caseIDList', array($case->id => sprintf('%03d', $case->id))) : sprintf('%03d', $case->id);
echo html::checkbox('caseIDList', array($case->id => sprintf('%03d', $case->id)));
break;
case 'pri':
echo "<span class='label-pri label-pri-" . $case->pri . "'>";
module/testtask/model.php
+7 -7
View File
@@ -1156,14 +1156,14 @@ class testtaskModel extends model
switch ($id)
{
case 'id':
if($mode == 'table')
{
//if($mode == 'table')
//{
echo html::checkbox('caseIDList', array($run->case => sprintf('%03d', $run->case)));
}
else
{
echo $canView ? html::a($caseLink, sprintf('%03d', $run->case)) : sprintf('%03d', $run->case);
}
//}
//else
//{
// echo $canView ? html::a($caseLink, sprintf('%03d', $run->case)) : sprintf('%03d', $run->case);
//}
break;
case 'pri':
echo "<span class='label-pri label-pri-" . $run->pri . "'>";