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

Merge branch 'sprint/220_tianshujie_bug25448' into 'master'

Browse Source 
Sprint/220 tianshujie bug25448

See merge request easycorp/zentaopms!4715
This commit is contained in:
王怡栋
2022-07-28 07:57:35 +00:00
parent 6446c442de 744da8aa6b
commit 31cbe228b3
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/custom/control.php
+1 -1
View File
@@ -609,7 +609,7 @@ class custom extends control
if($this->config->edition != 'max') $this->loadModel('setting')->setItem('system.custom.hourPoint', $this->post->hourPoint);
$this->app->loadLang('common');
$locate = $this->config->systemMode == 'new' ? inlink('flow') : 'top';
$locate = $this->config->systemMode == 'new' ? 'parent' : 'top';
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locate));
}
module/kanban/view/create.html.php
+1 -1
View File
@@ -66,7 +66,7 @@
<?php endif;?>
<tr>
<th class='columnWidth'><?php echo $lang->kanban->columnWidth;?></th>
<td><?php echo nl2br(html::radio('fluidBoard', $lang->kanbancolumn->fluidBoardList, isset($copyKanban->fluidBoard) ? $copyKanban->fluidBoard : 0));?></td>
<td colspan='2'><?php echo nl2br(html::radio('fluidBoard', $lang->kanbancolumn->fluidBoardList, isset($copyKanban->fluidBoard) ? $copyKanban->fluidBoard : 0));?></td>
</tr>
<tr>
<th rowspan='2'><?php echo $lang->kanban->import?></th>
module/kanban/view/edit.html.php
+1 -1
View File
@@ -55,7 +55,7 @@
<?php endif;?>
<tr>
<th class='columnWidth'><?php echo $lang->kanban->columnWidth;?></th>
<td><?php echo nl2br(html::radio('fluidBoard', $lang->kanbancolumn->fluidBoardList, $kanban->fluidBoard));?></td>
<td colspan='2'><?php echo nl2br(html::radio('fluidBoard', $lang->kanbancolumn->fluidBoardList, $kanban->fluidBoard));?></td>
</tr>
<?php if($laneCount > 1):?>
<tr>
module/my/control.php
+1 -1
View File
@@ -1270,7 +1270,7 @@ EOF;
{
if(empty($data->newList))
{
dao::$errors['newList'] = sprintf($this->lang->error->notempty, $this->lang->user->contacts->listName);
dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->user->contacts->listName);
$response['result'] = 'fail';
$response['message'] = dao::getError();