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

* fix bug.

Browse Source
This commit is contained in:
wangyidong
2020-05-26 09:14:31 +08:00
parent 5d5dd33ac5
commit fd0da30d09
10 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/view/productstatisticblock.html.php
+2 -1
View File
@@ -108,7 +108,8 @@ $(function()
<div class="col col-nav">
<ul class="nav nav-stacked nav-secondary scrollbar-hover" id='<?php echo $blockNavId;?>'>
<li class='switch-icon prev'><a><i class='icon icon-arrow-left'></i></a></li>
<?php $selected = empty($_SESSION['product']) ? key($products) : $this->session->product;?>
<?php $selected = empty($_SESSION['product']) ? key($products) : $this->session->product;?>
<?php $selected = !isset($products[$selected]) ? key($products) : $selected;?>
<?php foreach($products as $product):?>
<li <?php if($product->id == $selected) echo "class='active' id='activeProduct'";?> productID='<?php echo $product->id;?>'>
<a href="javascript:;" data-target="#tabProduct<?php echo $product->id;?>" data-toggle="tab" title='<?php echo $product->name;?>'><?php echo $product->name;?></a>
module/block/view/projectstatisticblock.html.php
+2 -1
View File
@@ -92,7 +92,8 @@ $(function()
<div class="col col-nav">
<ul class="nav nav-stacked nav-secondary scrollbar-hover" id='<?php echo $blockNavId;?>'>
<li class='switch-icon prev'><a><i class='icon icon-arrow-left'></i></a></li>
<?php $selected = empty($_SESSION['project']) ? key($projects) : $this->session->project;?>
<?php $selected = empty($_SESSION['project']) ? key($projects) : $this->session->project;?>
<?php $selected = !isset($projects[$selected]) ? key($projects) : $selected;?>
<?php foreach($projects as $project):?>
<li <?php if($project->id == $selected) echo "class='active' id='activeProject'";?> projectID='<?php echo $project->id;?>'>
<a href="###" data-target="#tab3Content<?php echo $project->id;?>" data-toggle="tab"><?php echo $project->name;?></a>
module/custom/config.php
+2
View File
@@ -9,6 +9,8 @@ $config->custom->canAdd['todo'] = 'priList,typeList';
$config->custom->canAdd['user'] = 'roleList';
$config->custom->canAdd['block'] = '';
$config->custom->noModuleMenu = array();
$config->custom->requiredModules[15] = 'product';
$config->custom->requiredModules[20] = 'story';
$config->custom->requiredModules[25] = 'productplan';
module/custom/control.php
+7 -2
View File
@@ -460,8 +460,13 @@ class custom extends control
}
if($module !== 'main')
{
$menu['module'] = customModel::getModuleMenu($module, true);
$menu['feature'] = customModel::getFeatureMenu($module, $method);
$menu['module'] = array();
$menu['feature'] = array();
if(!isset($this->config->custom->noModuleMenu[$module]))
{
$menu['module'] = customModel::getModuleMenu($module, true);
$menu['feature'] = customModel::getFeatureMenu($module, $method);
}
$menu['moduleName'] = $module;
$menu['methodName'] = $method;
}
module/task/model.php
+3 -2
View File
@@ -322,7 +322,7 @@ class taskModel extends model
->checkIF($task->estimate != '', 'estimate', 'float')
->exec();
if(dao::isError()) die(js::error(dao::getError()));
if(dao::isError()) return false;
$taskID = $this->dao->lastInsertID();
$childTasks .= $taskID . ',';
@@ -2688,7 +2688,8 @@ class taskModel extends model
if($id == 'status') $class .= ' task-' . $task->status;
if($id == 'id') $class .= ' cell-id';
if($id == 'name') $class .= ' text-left';
if($id == 'deadline' and isset($task->delay)) $class .= ' text-center delayed';
if($id == 'deadline') $class .= ' text-center';
if($id == 'deadline' and isset($task->delay)) $class .= ' delayed';
if($id == 'assignedTo') $class .= ' has-btn text-left';
if(strpos('progress', $id) !== false) $class .= ' text-right';
module/testtask/view/browseunits.html.php
+1 -1
View File
@@ -46,7 +46,7 @@
<?php endif;?>
<th class='text-left'> <?php common::printOrderLink('build', $orderBy, $vars, $lang->testtask->build);?></th>
<th class='c-user text-left'> <?php common::printOrderLink('owner', $orderBy, $vars, $lang->testtask->owner);?></th>
<th class='w-90px text-left'><?php common::printOrderLink('end', $orderBy, $vars, $lang->testtask->execTime);?></th>
<th class='w-90px text-left'> <?php common::printOrderLink('begin', $orderBy, $vars, $lang->testtask->execTime);?></th>
<th class='w-50px text-center'><?php echo $lang->testtask->caseCount;?></th>
<th class='w-40px text-center'><?php echo $lang->testtask->passCount;?></th>
<th class='w-40px text-center'><?php echo $lang->testtask->failCount;?></th>
module/todo/control.php
+1 -1
View File
@@ -142,7 +142,7 @@ class todo extends control
$actionID = $this->loadModel('action')->create('todo', $todoID, 'edited');
$this->action->logHistory($actionID, $changes);
}
die(js::locate($this->session->todoList, 'parent'));
die(js::locate($this->session->todoList, 'parent.parent'));
}
/* Judge a private todo or not, If private, die. */
module/todo/model.php
+20
View File
@@ -37,6 +37,13 @@ class todoModel extends model
->stripTags($this->config->todo->editor->create['id'], $this->config->allowedTags)
->remove('bug, task, story, uid, feedback')
->get();
if($todo->end <= $todo->begin)
{
dao::$errors[] = sprintf($this->lang->error->gt, $this->lang->todo->end, $this->lang->todo->begin);
return false;
}
if(empty($todo->cycle)) unset($todo->config);
if(!empty($todo->cycle))
{
@@ -58,6 +65,7 @@ class todoModel extends model
unset($todo->config['week']);
$todo->config['month'] = join(',', $todo->config['month']);
}
$todo->config['beforeDays'] = (int)$todo->config['beforeDays'];
$todo->config = json_encode($todo->config);
$todo->type = 'cycle';
}
@@ -118,6 +126,8 @@ class todoModel extends model
if($todo->type == 'task') $todo->idvalue = isset($todos->tasks[$i + 1]) ? $todos->tasks[$i + 1] : 0;
if($todo->type == 'story') $todo->idvalue = isset($todos->storys[$i + 1]) ? $todos->storys[$i + 1] : 0;
if($todo->end <= $todo->begin) die(js::alert(sprintf($this->lang->error->gt, $this->lang->todo->end, $this->lang->todo->begin)));
$this->dao->insert(TABLE_TODO)->data($todo)->autoCheck()->exec();
if(dao::isError())
{
@@ -162,6 +172,13 @@ class todoModel extends model
->stripTags($this->config->todo->editor->edit['id'], $this->config->allowedTags)
->remove('uid')
->get();
if($todo->end <= $todo->begin)
{
dao::$errors[] = sprintf($this->lang->error->gt, $this->lang->todo->end, $this->lang->todo->begin);
return false;
}
if(!empty($oldTodo->cycle))
{
$todo->config['begin'] = $todo->date;
@@ -182,6 +199,7 @@ class todoModel extends model
unset($todo->config['week']);
$todo->config['month'] = join(',', $todo->config['month']);
}
$todo->config['beforeDays'] = (int)$todo->config['beforeDays'];
$todo->config = json_encode($todo->config);
}
@@ -229,6 +247,8 @@ class todoModel extends model
if($todo->type == 'bug') $todo->idvalue = isset($data->bugs[$todoID]) ? $data->bugs[$todoID] : 0;
if($todo->type == 'story')$todo->idvalue = isset($data->storys[$todoID]) ? $data->storys[$todoID] : 0;
if($todo->end <= $todo->begin) die(js::alert(sprintf($this->lang->error->gt, $this->lang->todo->end, $this->lang->todo->begin)));
$todos[$todoID] = $todo;
}
module/todo/view/edit.html.php
+2 -2
View File
@@ -20,7 +20,7 @@
<div class="modal-header">
<h4 class='modal-title pull-left'><?php echo html::a($this->createLink('todo', 'view', 'todo=' . $todo->id), "TODO #{$todo->id} {$todo->name}");?></h4>
</div>
<form class='modal-body form-horizontal' method='post' id='dataform'>
<form class='modal-body form-horizontal' target='hiddenwin' method='post' id='dataform'>
<div class="row form-group">
<label class="col-sm-1"><?php echo $lang->todo->date;?></label>
<div class="col-sm-10">
@@ -66,7 +66,7 @@
</div>
</div>
<?php echo html::hidden('config[type]', $todo->config->type)?>
<div class='input-group' style='width:200px; padding-top:5px;'>
<div class='input-group' style='width:250px; padding-top:5px;'>
<?php printf($lang->todo->beforeDays, html::input('config[beforeDays]', $todo->config->beforeDays, "class='form-control'"));?>
</div>
</div>
module/user/model.php
+2 -2
View File
@@ -1453,7 +1453,7 @@ class userModel extends model
}
if(!empty($users)) continue;
if($objectType == 'product') $whiteList += $this->getProductWhiteListUsers($object, $groupUsers, zget($linkedProductProjects, $objctID, array()), zget($teamGroups, $objectID, array()));
if($objectType == 'product') $whiteList += $this->getProductWhiteListUsers($object, $groupUsers, zget($linkedProductProjects, $objectID, array()), zget($teamGroups, $objectID, array()));
if($objectType == 'project') $whiteList += $this->getProjectWhiteListUsers($object, $groupUsers, zget($teamGroups, $objectID, array()));
}
if(empty($objects)) return true;
@@ -1472,7 +1472,7 @@ class userModel extends model
{
foreach($objects as $objectID => $object)
{
$linkedProjects = $objectType == 'product' ? zget($linkedProductProjects, $objctID, array()) : array();
$linkedProjects = $objectType == 'product' ? zget($linkedProductProjects, $objectID, array()) : array();
$members = zget($teamGroups, $objectID, array());
if($objectType == 'product')