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

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport

Browse Source
This commit is contained in:
tanghucheng
2022-07-18 14:44:48 +08:00
parent 7693dd5797 ee7479b9d5
commit f714bae75f
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+1 -1
View File
@@ -1409,7 +1409,7 @@ class executionModel extends model
->andWhere('t2.deleted')->eq(0)
->fetchPairs();
$products = $this->loadModel('product')->getProductPairsByProject($projectID);
$products = $this->loadModel('product')->getProductPairsByProject($projectID, 'all', $executionProducts);
foreach($executions as $id => $execution)
{
module/my/view/changepassword.html.php
+1 -1
View File
@@ -45,7 +45,7 @@
<td><?php echo html::password('password2', '', "class='form-control'");?></td>
</tr>
<tr>
<td colspan='2' class='text-center form-actions'><?php echo html::submitButton() . html::backButton();?></td>
<td colspan='2' class='text-center form-actions'><?php echo html::submitButton();?></td>
</tr>
</table>
<?php if(!empty($this->app->user->modifyPasswordReason)):?>
module/task/control.php
+1 -1
View File
@@ -798,7 +798,7 @@ class task extends control
$execution = $this->execution->getByID($task->execution);
$execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
$execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
if(($this->app->tab == 'execution' or ($this->config->vision == 'lite' and $this->app->tab == 'project')) and $execution->type == 'kanban')
if(($this->app->tab == 'execution' or ($this->config->vision == 'lite' and $this->app->tab == 'project' and $this->session->kanbanview == 'kanban')) and $execution->type == 'kanban')
{
$rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
$kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
xuanxuan/extension/xuan/misc/ext/control/downloadclient.php
+1 -1
View File
@@ -102,7 +102,7 @@ class myMisc extends misc
if($action == 'downloadPackage')
{
ini_set('memory_limit', '512M');
ini_set('memory_limit', '1G');
$account = $this->app->user->account;
$clientDir = $this->app->wwwRoot . 'data/client/' . "$account/";