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

Merge branch 'master_xieqiyu_57850' into 'master'

Browse Source 
* Code for task#57850.

See merge request easycorp/zentaopms!4122
This commit is contained in:
王怡栋
2022-06-23 09:27:32 +00:00
parent a9ec749aa1 d4ac1b4a5f
commit 176239c74d
18 changed files with 45 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
+1
View File
@@ -690,6 +690,7 @@ class bugModel extends model
->setDefault('deadline', '0000-00-00')
->setDefault('resolvedDate', '0000-00-00 00:00:00')
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('mailto', '')
->add('lastEditedDate', $now)
->setIF(strpos($this->config->bug->edit->requiredFields, 'deadline') !== false, 'deadline', $this->post->deadline)
->join('openedBuild', ',')
module/custom/control.php
+7 -5
View File
@@ -139,6 +139,10 @@ class custom extends control
elseif($module == 'story' and $field == 'review')
{
$data = fixer::input('post')
->setDefault('forceReview', '')
->setDefault('forceNotReview', '')
->setDefault('forceReviewRoles', '')
->setDefault('forceNotReviewRoles', '')
->setDefault('forceReviewDepts', '')
->setDefault('forceNotReviewDepts', '')
->join('forceReview', ',')
@@ -160,16 +164,14 @@ class custom extends control
}
elseif($module == 'story' and $field == 'reviewRules')
{
$data = fixer::input('post')->join('superReviewers', ',')->get();
$data = fixer::input('post')->setDefault('superReviewers', '')->join('superReviewers', ',')->get();
$this->loadModel('setting')->setItems("system.$module@{$this->config->vision}", $data);
}
elseif($module == 'testcase' and $field == 'review')
{
$review = fixer::input('post')->get();
if($review->needReview) $data = fixer::input('post')->join('forceNotReview', ',')->remove('forceReview')->get();
if(!$review->needReview) $data = fixer::input('post')->join('forceReview', ',')->remove('forceNotReview')->get();
if(!isset($data->forceReview)) $data->forceReview = '';
if(!isset($data->forceNotReview)) $data->forceNotReview = '';
if($review->needReview) $data = fixer::input('post')->setDefault('forceNotReview', '')->join('forceNotReview', ',')->remove('forceReview')->get();
if(!$review->needReview) $data = fixer::input('post')->setDefault('forceReview', '')->join('forceReview', ',')->remove('forceNotReview')->get();
$this->loadModel('setting')->setItems("system.$module", $data);
$reviewCase = isset($review->reviewCase) ? $review->reviewCase : 0;
module/doc/control.php
+7 -6
View File
@@ -844,6 +844,7 @@ class doc extends control
$users = $this->user->getPairs('noletter|noempty|noclosed');
$selectedUser = $docID ? $doc->users : $doclib->users;
$selectedGroup = $docID ? $doc->groups : $doclib->groups;
$dropDirection = "data-drop-direction='top'";
if($control == 'group')
{
@@ -854,10 +855,10 @@ class doc extends control
{
if(strpos($doclib->groups, (string)$groupID) === false) unset($groups[$groupID]);
}
return print(html::select('groups[]', $groups, $selectedGroup, "class='form-control chosen' multiple"));
return print(html::select('groups[]', $groups, $selectedGroup, "class='form-control picker-select' multiple $dropDirection"));
}
if($doclib->acl == 'open') return print(html::select('groups[]', $groups, $selectedGroup, "class='form-control chosen' multiple"));
if($doclib->acl == 'default') return print(html::select('groups[]', $groups, $selectedGroup, "class='form-control chosen' multiple"));
if($doclib->acl == 'open') return print(html::select('groups[]', $groups, $selectedGroup, "class='form-control picker-select' multiple $dropDirection"));
if($doclib->acl == 'default') return print(html::select('groups[]', $groups, $selectedGroup, "class='form-control picker-select' multiple $dropDirection"));
if($doclib->acl == 'private') echo 'private';
return false;
}
@@ -871,10 +872,10 @@ class doc extends control
if($doclib->acl == 'custom')
{
return print(html::select('users[]', $users, $selectedUser, "multiple class='form-control'"));
return print(html::select('users[]', $users, $selectedUser, "multiple class='form-control picker-select' $dropDirection"));
}
if($doclib->acl == 'open') return print(html::select('users[]', $users, $selectedUser, "multiple class='form-control'"));
if($doclib->acl == 'default') return print(html::select('users[]', $users, $selectedUser, "multiple class='form-control'"));
if($doclib->acl == 'open') return print(html::select('users[]', $users, $selectedUser, "multiple class='form-control picker-select' $dropDirection"));
if($doclib->acl == 'default') return print(html::select('users[]', $users, $selectedUser, "multiple class='form-control picker-select' $dropDirection"));
if($doclib->acl == 'private') echo 'private';
return false;
}
module/doc/js/create.js
+2 -9
View File
@@ -119,7 +119,7 @@ function loadWhitelist(libID)
{
$('#groups').replaceWith(groups);
$('#groups_chosen').remove();
$('#groups').chosen();
$('#groups').picker();
}
});
@@ -140,14 +140,7 @@ function loadWhitelist(libID)
$('#users').replaceWith(users);
$('#users_chosen').remove();
$('#whiteListBox .picker').remove();
if($('#users option').length < maxCount)
{
$('#users').chosen();
}
else
{
$('#users').picker();
}
$('#users').picker();
}
});
}
module/doc/js/edit.js
+2 -9
View File
@@ -143,7 +143,7 @@ function loadWhitelist(libID)
{
$('#groups').replaceWith(groups);
$('#groups_chosen').remove();
$('#groups').chosen();
$('#groups').picker();
}
});
@@ -164,14 +164,7 @@ function loadWhitelist(libID)
$('#users').replaceWith(users);
$('#users_chosen').remove();
$('#whiteListBox .picker').remove();
if($('#users option').length < maxCount)
{
$('#users').chosen();
}
else
{
$('#users').picker();
}
$('#users').picker();
}
});
}
module/doc/model.php
+1
View File
@@ -808,6 +808,7 @@ class docModel extends model
->setDefault('groups', '')
->setDefault('product', 0)
->setDefault('execution', 0)
->setDefault('mailto', '')
->add('editedBy', $this->app->user->account)
->add('editedDate', $now)
->cleanInt('module')
module/doc/view/create.html.php
+3 -3
View File
@@ -99,7 +99,7 @@ $("a[href^='###']").click(function()
<td colspan="2">
<div class="input-group">
<?php
echo html::select('mailto[]', $users, '', "multiple class='form-control picker-select' data-dropDirection='top'");
echo html::select('mailto[]', $users, '', "multiple class='form-control picker-select' data-drop-direction='top'");
echo $this->fetch('my', 'buildContactLists');
?>
</div>
@@ -118,11 +118,11 @@ $("a[href^='###']").click(function()
<td colspan='2'>
<div class='input-group'>
<span class='input-group-addon groups-addon'><?php echo $lang->doclib->group?></span>
<?php echo html::select('groups[]', $groups, '', "class='form-control picker-select' multiple data-dropDirection='top'")?>
<?php echo html::select('groups[]', $groups, '', "class='form-control picker-select' multiple data-drop-direction='top'")?>
</div>
<div class='input-group'>
<span class='input-group-addon'><?php echo $lang->doclib->user?></span>
<?php echo html::select('users[]', $users, '', "class='form-control picker-select' multiple data-dropDirection='top'")?>
<?php echo html::select('users[]', $users, '', "class='form-control picker-select' multiple data-drop-direction='top'")?>
</div>
</td>
</tr>
module/doc/view/edit.html.php
+3 -3
View File
@@ -74,7 +74,7 @@
<td colspan="2">
<div class="input-group">
<?php
echo html::select('mailto[]', $users, $doc->mailto, "multiple class='form-control picker-select'");
echo html::select('mailto[]', $users, $doc->mailto, "multiple class='form-control picker-select' data-drop-direction='top'");
echo $this->fetch('my', 'buildContactLists');
?>
</div>
@@ -92,11 +92,11 @@
<td colspan='2'>
<div class='input-group w-p100'>
<span class='input-group-addon groups-addon'><?php echo $lang->doclib->group?></span>
<?php echo html::select('groups[]', $groups, $doc->groups, "class='form-control picker-select' multiple")?>
<?php echo html::select('groups[]', $groups, $doc->groups, "class='form-control picker-select' multiple data-drop-direction='top'")?>
</div>
<div class='input-group w-p100'>
<span class='input-group-addon'><?php echo $lang->doclib->user?></span>
<?php echo html::select('users[]', $users, $doc->users, "class='form-control picker-select' multiple")?>
<?php echo html::select('users[]', $users, $doc->users, "class='form-control picker-select' multiple data-drop-direction='top'")?>
</div>
</td>
</tr>
module/kanban/model.php
+4
View File
@@ -1857,6 +1857,8 @@ class kanbanModel extends model
$space = fixer::input('post')
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', helper::now())
->setDefault('whitelist', '')
->setDefault('team', '')
->join('whitelist', ',')
->join('team', ',')
->trim('name')
@@ -2126,6 +2128,8 @@ class kanbanModel extends model
->setDefault('lastEditedBy', $account)
->setDefault('lastEditedDate', helper::now())
->setDefault('displayCards', 0)
->setDefault('whitelist', '')
->setDefault('team', '')
->setIF($this->post->import == 'off', 'object', '')
->setIF($this->post->heightType == 'auto', 'displayCards', 0)
->join('whitelist', ',')
module/product/model.php
+2 -1
View File
@@ -753,7 +753,8 @@ class productModel extends model
->add('id', $productID)
->callFunc('name', 'trim')
->setDefault('line', 0)
->setIF(!isset($_POST['whitelist']), 'whitelist', '')
->setDefault('whitelist', '')
->setDefault('reviewer', '')
->join('whitelist', ',')
->join('reviewer', ',')
->stripTags($this->config->product->editor->edit['id'], $this->config->allowedTags)
module/product/view/create.html.php
+2 -2
View File
@@ -73,7 +73,7 @@
</tr>
<tr>
<th><?php echo $lang->product->reviewer;?></th>
<td><?php echo html::select('reviewer[]', $users, '', "class='form-control chosen' multiple");?></td>
<td><?php echo html::select('reviewer[]', $users, '', "class='form-control picker-select' multiple");?></td>
</tr>
<tr>
<th><?php echo $lang->product->type;?></th>
@@ -107,7 +107,7 @@
<th><?php echo $lang->whitelist;?></th>
<td colspan='1'>
<div class='input-group'>
<?php echo html::select('whitelist[]', $users, '', 'class="form-control chosen" multiple');?>
<?php echo html::select('whitelist[]', $users, '', 'class="form-control picker-select" multiple');?>
<?php echo $this->fetch('my', 'buildContactLists', "dropdownName=whitelist");?>
</div>
</td>
module/projectrelease/model.php
+1
View File
@@ -114,6 +114,7 @@ class projectreleaseModel extends model
$release = fixer::input('post')->stripTags($this->config->release->editor->edit['id'], $this->config->allowedTags)
->add('branch', (int)$branch)
->setDefault('mailto', '')
->join('mailto', ',')
->setIF(!$this->post->marker, 'marker', 0)
->cleanInt('product')
module/release/model.php
+1
View File
@@ -248,6 +248,7 @@ class releaseModel extends model
$release = fixer::input('post')->stripTags($this->config->release->editor->edit['id'], $this->config->allowedTags)
->add('id', $releaseID)
->add('branch', (int)$branch)
->setDefault('mailto', '')
->join('mailto', ',')
->setIF(!$this->post->marker, 'marker', 0)
->cleanInt('product')
module/story/model.php
+2
View File
@@ -772,6 +772,8 @@ class storyModel extends model
->cleanFloat('estimate')
->setDefault('assignedDate', $oldStory->assignedDate)
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('reviewedBy', '')
->setDefault('mailto', '')
->add('id', $storyID)
->add('lastEditedDate', $now)
->setDefault('plan,notifyEmail', '')
module/task/model.php
+1
View File
@@ -928,6 +928,7 @@ class taskModel extends model
->add('id', $taskID)
->setDefault('story, estimate, left, consumed', 0)
->setDefault('realStarted', '0000-00-00 00:00:00')
->setDefault('mailto', '')
->setIF(is_numeric($this->post->estimate), 'estimate', (float)$this->post->estimate)
->setIF(is_numeric($this->post->consumed), 'consumed', (float)$this->post->consumed)
->setIF(is_numeric($this->post->left), 'left', (float)$this->post->left)
module/testcase/model.php
+1
View File
@@ -766,6 +766,7 @@ class testcaseModel extends model
->setDefault('lastEditedBy', $this->app->user->account)
->add('lastEditedDate', $now)
->setDefault('story,branch', 0)
->setDefault('stage', '')
->join('stage', ',')
->join('linkCase', ',')
->setForce('status', $status)
module/testtask/model.php
+2
View File
@@ -736,6 +736,8 @@ class testtaskModel extends model
$oldTask = $this->dao->select("*")->from(TABLE_TESTTASK)->where('id')->eq((int)$taskID)->fetch();
$task = fixer::input('post')
->add('id', $taskID)
->setDefault('type', '')
->setDefault('mailto', '')
->stripTags($this->config->testtask->editor->edit['id'], $this->config->allowedTags)
->join('mailto', ',')
->join('type', ',')
module/user/control.php
+3 -3
View File
@@ -1123,7 +1123,7 @@ class user extends control
/**
* Reset password.
*
* @param string $code
* @param string $code
* @access public
* @return void
*/
@@ -1134,7 +1134,7 @@ class user extends control
if($user)
{
$resetToken = json_decode($user->resetToken);
if($resetToken->endTime >= time()) $expired = false;
if($resetToken->endTime >= time()) $expired = false;
}
if(!empty($_POST))
@@ -1165,7 +1165,7 @@ class user extends control
$this->view->expired = $expired;
$this->view->user = empty($user) ? '' : $user;
$this->display();
$this->display();
}
/**