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

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

Browse Source 
Sprint/220 tianshujie fixbug

See merge request easycorp/zentaopms!4707
This commit is contained in:
王怡栋
2022-07-28 05:47:21 +00:00
parent 9cffdad887 dbcb3c9f1b
commit 5ec5c071f3
10 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+3 -2
View File
@@ -2254,12 +2254,13 @@ class bug extends control
* AJAX: get all users as assignedTo list.
*
* @param string $selectedUser
* @param string $params noletter|noempty|nodeleted|noclosed|withguest|pofirst|devfirst|qafirst|pmfirst|realname|outside|inside|all, can be sets of theme
* @access public
* @return string
*/
public function ajaxLoadAllUsers($selectedUser = '')
public function ajaxLoadAllUsers($selectedUser = '', $params = 'devfirst|noclosed')
{
$allUsers = $this->loadModel('user')->getPairs('devfirst|noclosed');
$allUsers = $this->loadModel('user')->getPairs($params);
return print(html::select('assignedTo', $allUsers, $selectedUser, 'class="form-control"'));
}
module/bug/js/common.js
+11 -4
View File
@@ -60,14 +60,21 @@ function loadAll(productID)
*/
function loadAllUsers()
{
var link = createLink('bug', 'ajaxLoadAllUsers', 'selectedUser=' + $('#assignedTo').val());
isClosedBug = typeof isClosedBug == 'undefined' ? false : isClosedBug;
var params = isClosedBug ? '&params=devfirst' : '';
var link = createLink('bug', 'ajaxLoadAllUsers', 'selectedUser=' + $('#assignedTo').val() + params);
$.get(link, function(data)
{
if(data)
{
var moduleID = $('#module').val();
var productID = $('#product').val();
setAssignedTo(moduleID, productID);
if(!isClosedBug)
{
var moduleID = $('#module').val();
var productID = $('#product').val();
setAssignedTo(moduleID, productID);
}
$('#assignedTo').replaceWith(data);
$('#assignedTo_chosen').remove();
$('#assignedTo').chosen();
module/bug/view/edit.html.php
+1
View File
@@ -28,6 +28,7 @@ js::set('systemMode' , $config->systemMode);
js::set('confirmUnlinkBuild' , sprintf($lang->bug->confirmUnlinkBuild, zget($resolvedBuilds, $bug->resolvedBuild)));
js::set('tab' , $this->app->tab);
js::set('bugBranch' , $bug->branch);
js::set('isClosedBug' , $bug->status == 'closed');
if($this->app->tab == 'execution') js::set('objectID', $bug->execution);
if($this->app->tab == 'project') js::set('objectID', $bug->project);
?>
module/design/view/edit.html.php
+1 -1
View File
@@ -79,7 +79,7 @@
<?php foreach($design->tasks as $task):?>
<tr class='text-center'>
<td><?php $task->id?></td>
<td class='text-left'><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), $task->name, '_blank');?></td>;
<td class='text-left'><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), $task->name, '_blank');?></td>
<td><?php echo zget($users, $task->assignedTo);?></td>
<td><span class='status-task status-<?php echo $task->status;?>'><?php $this->processStatus('task', $task);?></span></td>
<td><?php echo $task->consumed;?></td>
module/kanban/control.php
+1 -1
View File
@@ -1512,7 +1512,7 @@ class kanban extends control
$this->loadModel($objectType)->delete(constant($table), $objectID);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
$kanbanID = $regionID ? $this->kanban->getKanbanIDByregion($regionID) : $this->session->execution;
$kanbanID = $regionID ? $this->kanban->getKanbanIDByRegion($regionID) : $this->session->execution;
$browseType = $this->config->vision == 'lite' ? 'task' : $this->session->execLaneType;
$groupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
$kanbanGroup = $this->kanban->getRDKanban($kanbanID, $browseType, 'id_desc', 0, $groupBy);
module/personnel/css/whitelist.css
+2 -1
View File
@@ -1,3 +1,4 @@
.c-dept {overflow:hidden; text-overflow: ellipsis; white-space: nowrap;}
.c-dept, .c-role {overflow:hidden; text-overflow: ellipsis; white-space: nowrap;}
.c-phone {width: 120px;}
.c-email {width: 200px;}
.c-role {width: 105px;}
module/personnel/view/whitelist.html.php
+1 -1
View File
@@ -51,7 +51,7 @@
</td>
<td><?php echo $user->realname;?></td>
<td class='c-dept' title="<?php echo zget($depts, $user->dept);?>"><?php echo zget($depts, $user->dept);?></td>
<td><?php echo zget($lang->user->roleList, $user->role);?></td>
<td title="<?php echo zget($lang->user->roleList, $user->role)?>"><?php echo zget($lang->user->roleList, $user->role);?></td>
<td title="<?php echo $user->phone;?>"><?php echo $user->phone;?></td>
<td title="<?php echo $user->qq;?>"><?php echo $user->qq;?></td>
<td title="<?php echo $user->weixin;?>"><?php echo $user->weixin;?></td>
module/project/css/team.css
+3
View File
@@ -0,0 +1,3 @@
.c-limited {width: 100px;}
[lang^=de] .c-limited {width: 175px !important;}
.c-actions-1 {width: 80px;}
module/project/view/team.html.php
+2 -2
View File
@@ -58,9 +58,9 @@
<th><?php echo $lang->team->days;?></th>
<th><?php echo $lang->team->hours;?></th>
<th><?php echo $lang->team->totalHours;?></th>
<th class='w-100px text-center'><?php echo $lang->team->limited;?></th>
<th class='c-limited text-center'><?php echo $lang->team->limited;?></th>
<?php if($canBeChanged):?>
<th class='c-actions-1 w-80px text-center'><?php echo $lang->actions;?></th>
<th class='c-actions-1 text-center'><?php echo $lang->actions;?></th>
<?php endif;?>
</tr>
</thead>
module/release/view/browse.html.php
+1 -1
View File
@@ -86,9 +86,9 @@
<?php endforeach;?>
</tbody>
</table>
<?php endif;?>
<div class='table-footer'>
<?php $pager->show('right', 'pagerjs');?>
</div>
<?php endif;?>
</div>
<?php include '../../common/view/footer.html.php';?>