- + diff --git a/module/index/css/index.css b/module/index/css/index.css index 1ae12da38f..bdd0ebe853 100644 --- a/module/index/css/index.css +++ b/module/index/css/index.css @@ -120,3 +120,5 @@ body.menu-hide {padding-left: 0;} { #upgradeContent{width: 85%;} } +#searchbox .dropdown-menu > li.search-type-all{max-width: 250px} +#searchbox .dropdown-menu > li.search-type-all a{width: 100%; overflow: hidden; text-overflow: ellipsis;} diff --git a/module/job/control.php b/module/job/control.php index bcbbbb22a1..f6440f3af3 100644 --- a/module/job/control.php +++ b/module/job/control.php @@ -139,16 +139,16 @@ class job extends control /** * Edit a job. * - * @param int $id + * @param int $jobID * @access public * @return void */ - public function edit($id) + public function edit($jobID) { - $job = $this->job->getByID($id); + $job = $this->job->getByID($jobID); if($_POST) { - $this->job->update($id); + $this->job->update($jobID); if(dao::isError()) { $errors = dao::getError(); @@ -174,7 +174,7 @@ class job extends control return $this->send(array('result' => 'fail', 'message' => $errors)); } - $this->loadModel('action')->create('job', $id, 'edited'); + $this->loadModel('action')->create('job', $jobID, 'edited'); return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse', "repoID={$job->repo}"))); } @@ -190,7 +190,7 @@ class job extends control foreach($repoList as $repo) { if(empty($repo->synced)) continue; - $repoPairs[$repo->id] = $repo->name; + $repoPairs[$repo->id] = "[{$repo->SCM}] {$repo->name}"; $repoTypes[$repo->id] = $repo->SCM; if(strtolower($repo->SCM) == 'gitlab') $gitlabRepos[$repo->id] = $repo->name; } @@ -221,15 +221,15 @@ class job extends control /** * Delete a job. * - * @param int $id + * @param int $jobID * @access public * @return void */ - public function delete($id, $confirm = 'no') + public function delete($jobID, $confirm = 'no') { - if($confirm != 'yes') return print(js::confirm($this->lang->job->confirmDelete, inlink('delete', "jobID=$id&confirm=yes"))); + if($confirm != 'yes') return print(js::confirm($this->lang->job->confirmDelete, inlink('delete', "jobID=$jobID&confirm=yes"))); - $this->job->delete(TABLE_JOB, $id); + $this->job->delete(TABLE_JOB, $jobID); echo js::reload('parent'); } @@ -317,27 +317,27 @@ class job extends control /** * Exec a job. * - * @param int $id + * @param int $jobID * @param string $showForm * @access public * @return void */ - public function exec($id) + public function exec($jobID) { - $job = $this->job->getByID($id); + $job = $this->job->getByID($jobID); if(strtolower($job->engine) == 'gitlab') { if(!isset($job->reference) or !$job->reference) { - return $this->send(array('result' => 'fail', 'message' => $this->lang->job->setReferenceTips, 'locate' => inlink('edit', "id=$id"))); + return $this->send(array('result' => 'fail', 'message' => $this->lang->job->setReferenceTips, 'locate' => inlink('edit', "id=$jobID"))); } } - $compile = $this->job->exec($id); + $compile = $this->job->exec($jobID); if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); $this->app->loadLang('compile'); - $this->loadModel('action')->create('job', $id, 'executed'); + $this->loadModel('action')->create('job', $jobID, 'executed'); return $this->send(array('result' => 'success', 'message' => sprintf($this->lang->job->sendExec, zget($this->lang->compile->statusList, $compile->status)))); } @@ -409,7 +409,7 @@ class job extends control } else { - $repoPairs[$repo->id] = $repo->name; + $repoPairs[$repo->id] = "[{$repo->SCM}] {$repo->name}"; } } echo html::select('repo', $repoPairs, '', "class='form-control chosen'"); diff --git a/module/job/model.php b/module/job/model.php index b8b0933748..c3d53774e7 100644 --- a/module/job/model.php +++ b/module/job/model.php @@ -46,7 +46,7 @@ class jobModel extends model */ public function getList($repoID = 0, $orderBy = 'id_desc', $pager = null, $engine = '', $pipeline = '') { - return $this->dao->select('t1.*, t2.name as repoName, t3.name as jenkinsName')->from(TABLE_JOB)->alias('t1') + return $this->dao->select('t1.*, DATE_FORMAT(t1.lastExec, "%m-%d %H:%i") AS lastExec, t2.name as repoName, t3.name as jenkinsName')->from(TABLE_JOB)->alias('t1') ->leftJoin(TABLE_REPO)->alias('t2')->on('t1.repo=t2.id') ->leftJoin(TABLE_PIPELINE)->alias('t3')->on('t1.server=t3.id') ->where('t1.deleted')->eq('0') @@ -182,7 +182,7 @@ class jobModel extends model $repo = $this->loadModel('repo')->getRepoByID($job->repo); $project = zget($repo, 'project'); - $job->server = (int)zget($repo, 'gitlab', 0); + $job->server = (int)zget($repo, 'serviceHost', 0); $job->pipeline = json_encode(array('project' => $project, 'reference' => $this->post->reference)); } @@ -300,7 +300,7 @@ class jobModel extends model $project = zget($repo, 'project'); $job->repo = $job->gitlabRepo; - $job->server = (int)zget($repo, 'gitlab', 0); + $job->server = (int)zget($repo, 'serviceHost', 0); $job->pipeline = json_encode(array('project' => $project, 'reference' => $this->post->reference)); } diff --git a/module/job/view/browse.html.php b/module/job/view/browse.html.php index 36beae9008..0a1e92e209 100644 --- a/module/job/view/browse.html.php +++ b/module/job/view/browse.html.php @@ -72,7 +72,7 @@ - + diff --git a/module/kanban/control.php b/module/kanban/control.php index f05f52ccfc..3b4ac85967 100644 --- a/module/kanban/control.php +++ b/module/kanban/control.php @@ -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); diff --git a/module/kanban/view/create.html.php b/module/kanban/view/create.html.php index e6f7c996b3..0c9c7f716a 100644 --- a/module/kanban/view/create.html.php +++ b/module/kanban/view/create.html.php @@ -66,7 +66,7 @@ - + diff --git a/module/kanban/view/edit.html.php b/module/kanban/view/edit.html.php index 2eb21ae1ca..03098f0379 100644 --- a/module/kanban/view/edit.html.php +++ b/module/kanban/view/edit.html.php @@ -55,7 +55,7 @@ - + 1):?> diff --git a/module/mr/control.php b/module/mr/control.php index 85e6294589..ad54afbbf9 100644 --- a/module/mr/control.php +++ b/module/mr/control.php @@ -54,8 +54,9 @@ class mr extends control /* Check whether Mr is linked with the product. */ foreach($MRList as $MR) { - $product = $this->mr->getMRProduct($MR); - $MR->linkButton = empty($product) ? false : true; + $product = $this->mr->getMRProduct($MR); + $MR->linkButton = empty($product) ? false : true; + $MR->createdDate = date('m-d H:i', strtotime($MR->createdDate)); } /* Load lang from compile module */ diff --git a/module/mr/css/browse.css b/module/mr/css/browse.css index 2178adff41..edb89a5bf2 100644 --- a/module/mr/css/browse.css +++ b/module/mr/css/browse.css @@ -13,8 +13,9 @@ #repoList .tree li > a {line-height: 20px; border-radius: 2px;} .c-id {width: 60px;} -.c-title {min-width: 120px;} -.c-branch {width: 240px;} +.c-title {width: 150px;} +.c-branch {width: 200px;} .c-status {width: 120px;} -.c-author {width: 100px;} -.c-date {width: 140px;} +.c-author {width: 80px;} +.c-date {width: 100px;} +[lang^='zh-'] .c-status {width: 100px;} diff --git a/module/mr/lang/de.php b/module/mr/lang/de.php index c24db27c9a..438764422d 100644 --- a/module/mr/lang/de.php +++ b/module/mr/lang/de.php @@ -121,6 +121,7 @@ $lang->mr->apiErrorMap[4] = "403 Forbidden"; $lang->mr->apiErrorMap[5] = "/(pull request already exists for these targets).*/"; $lang->mr->apiErrorMap[6] = "Invalid PullRequest: There are no changes between the head and the base"; $lang->mr->apiErrorMap[7] = "/(user doesn't have access to repo).*/"; +$lang->mr->apiErrorMap[8] = "/(git apply).*/"; $lang->mr->errorLang[1] = 'The source project branch cannot be the same as the target project branch'; $lang->mr->errorLang[2] = 'Another open merge request already exists for this source branch: ID%u'; @@ -129,6 +130,7 @@ $lang->mr->errorLang[4] = 'Permission denied'; $lang->mr->errorLang[5] = 'Another open merge request already exists for this source branch'; $lang->mr->errorLang[6] = 'The source project branch cannot be the same as the target project branch'; $lang->mr->errorLang[7] = "user doesn't have access to repo"; +$lang->mr->errorLang[8] = 'The source branch and target branch cannot be merged'; $lang->mr->from = "from"; $lang->mr->to = "to"; diff --git a/module/mr/lang/en.php b/module/mr/lang/en.php index c24db27c9a..438764422d 100644 --- a/module/mr/lang/en.php +++ b/module/mr/lang/en.php @@ -121,6 +121,7 @@ $lang->mr->apiErrorMap[4] = "403 Forbidden"; $lang->mr->apiErrorMap[5] = "/(pull request already exists for these targets).*/"; $lang->mr->apiErrorMap[6] = "Invalid PullRequest: There are no changes between the head and the base"; $lang->mr->apiErrorMap[7] = "/(user doesn't have access to repo).*/"; +$lang->mr->apiErrorMap[8] = "/(git apply).*/"; $lang->mr->errorLang[1] = 'The source project branch cannot be the same as the target project branch'; $lang->mr->errorLang[2] = 'Another open merge request already exists for this source branch: ID%u'; @@ -129,6 +130,7 @@ $lang->mr->errorLang[4] = 'Permission denied'; $lang->mr->errorLang[5] = 'Another open merge request already exists for this source branch'; $lang->mr->errorLang[6] = 'The source project branch cannot be the same as the target project branch'; $lang->mr->errorLang[7] = "user doesn't have access to repo"; +$lang->mr->errorLang[8] = 'The source branch and target branch cannot be merged'; $lang->mr->from = "from"; $lang->mr->to = "to"; diff --git a/module/mr/lang/fr.php b/module/mr/lang/fr.php index c24db27c9a..438764422d 100644 --- a/module/mr/lang/fr.php +++ b/module/mr/lang/fr.php @@ -121,6 +121,7 @@ $lang->mr->apiErrorMap[4] = "403 Forbidden"; $lang->mr->apiErrorMap[5] = "/(pull request already exists for these targets).*/"; $lang->mr->apiErrorMap[6] = "Invalid PullRequest: There are no changes between the head and the base"; $lang->mr->apiErrorMap[7] = "/(user doesn't have access to repo).*/"; +$lang->mr->apiErrorMap[8] = "/(git apply).*/"; $lang->mr->errorLang[1] = 'The source project branch cannot be the same as the target project branch'; $lang->mr->errorLang[2] = 'Another open merge request already exists for this source branch: ID%u'; @@ -129,6 +130,7 @@ $lang->mr->errorLang[4] = 'Permission denied'; $lang->mr->errorLang[5] = 'Another open merge request already exists for this source branch'; $lang->mr->errorLang[6] = 'The source project branch cannot be the same as the target project branch'; $lang->mr->errorLang[7] = "user doesn't have access to repo"; +$lang->mr->errorLang[8] = 'The source branch and target branch cannot be merged'; $lang->mr->from = "from"; $lang->mr->to = "to"; diff --git a/module/mr/lang/vi.php b/module/mr/lang/vi.php index c24db27c9a..438764422d 100644 --- a/module/mr/lang/vi.php +++ b/module/mr/lang/vi.php @@ -121,6 +121,7 @@ $lang->mr->apiErrorMap[4] = "403 Forbidden"; $lang->mr->apiErrorMap[5] = "/(pull request already exists for these targets).*/"; $lang->mr->apiErrorMap[6] = "Invalid PullRequest: There are no changes between the head and the base"; $lang->mr->apiErrorMap[7] = "/(user doesn't have access to repo).*/"; +$lang->mr->apiErrorMap[8] = "/(git apply).*/"; $lang->mr->errorLang[1] = 'The source project branch cannot be the same as the target project branch'; $lang->mr->errorLang[2] = 'Another open merge request already exists for this source branch: ID%u'; @@ -129,6 +130,7 @@ $lang->mr->errorLang[4] = 'Permission denied'; $lang->mr->errorLang[5] = 'Another open merge request already exists for this source branch'; $lang->mr->errorLang[6] = 'The source project branch cannot be the same as the target project branch'; $lang->mr->errorLang[7] = "user doesn't have access to repo"; +$lang->mr->errorLang[8] = 'The source branch and target branch cannot be merged'; $lang->mr->from = "from"; $lang->mr->to = "to"; diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php index ecefd0fda4..cd13f13884 100644 --- a/module/mr/lang/zh-cn.php +++ b/module/mr/lang/zh-cn.php @@ -121,6 +121,7 @@ $lang->mr->apiErrorMap[4] = "403 Forbidden"; $lang->mr->apiErrorMap[5] = "/(pull request already exists for these targets).*/"; $lang->mr->apiErrorMap[6] = "Invalid PullRequest: There are no changes between the head and the base"; $lang->mr->apiErrorMap[7] = "/(user doesn't have access to repo).*/"; +$lang->mr->apiErrorMap[8] = "/(git apply).*/"; $lang->mr->errorLang[1] = '源项目分支与目标项目分支不能相同'; $lang->mr->errorLang[2] = '存在另外一个同样的合并请求在源项目分支中: ID%u'; @@ -129,6 +130,7 @@ $lang->mr->errorLang[4] = '权限不足'; $lang->mr->errorLang[5] = '存在另外一个同样的合并请求在源项目分支中'; $lang->mr->errorLang[6] = '源项目分支与目标项目分支不能相同'; $lang->mr->errorLang[7] = '您无权合并改版本库'; +$lang->mr->errorLang[8] = '当前源分支和目标分支无法合并'; $lang->mr->from = "从"; $lang->mr->to = "合并到"; diff --git a/module/mr/view/browse.html.php b/module/mr/view/browse.html.php index a03b3565cb..5bf5ff0f78 100644 --- a/module/mr/view/browse.html.php +++ b/module/mr/view/browse.html.php @@ -88,7 +88,7 @@ - + - + diff --git a/module/product/model.php b/module/product/model.php index 43e1d0f115..546770dae9 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -671,6 +671,7 @@ class productModel extends model ->remove('uid,newLine,lineName,contactListMenu') ->get(); + $this->lang->error->unique = $this->lang->error->repeat; $product = $this->loadModel('file')->processImgURL($product, $this->config->product->editor->create['id'], $this->post->uid); $programID = isset($product->program) ? $product->program : 0; $this->dao->insert(TABLE_PRODUCT)->data($product)->autoCheck() @@ -763,6 +764,7 @@ class productModel extends model ->remove('uid,changeProjects,contactListMenu') ->get(); + $this->lang->error->unique = $this->lang->error->repeat; $product = $this->loadModel('file')->processImgURL($product, $this->config->product->editor->edit['id'], $this->post->uid); $programID = isset($product->program) ? $product->program : ''; $this->dao->update(TABLE_PRODUCT)->data($product)->autoCheck() diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index ac1667617a..a90740efce 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -278,7 +278,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : ''; $datatableId = $this->moduleName . ucfirst($this->methodName); $useDatatable = (isset($config->datatable->$datatableId->mode) and $config->datatable->$datatableId->mode == 'datatable'); $vars = "productID=$productID&branch=$branch&browseType=$browseType¶m=$param&storyType=$storyType&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; - if($from == 'project') $vars = "projectID=$projectID&productID=$productID&branch=$branch&browseType=$browseType¶m=$param&storyType=$storyType&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; + if($from == 'project' and !empty($projectID)) $vars = "projectID=$projectID&productID=$productID&branch=$branch&browseType=$browseType¶m=$param&storyType=$storyType&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; if($useDatatable) include '../../common/view/datatable.html.php'; $setting = $this->datatable->getSetting('product'); diff --git a/module/program/model.php b/module/program/model.php index 64cce62d4a..84eef5815d 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -753,6 +753,7 @@ class programModel extends model if(isset($this->lang->program->$field)) $this->lang->project->$field = $this->lang->program->$field; } + $this->lang->error->unique = $this->lang->error->repeat; $program = $this->loadModel('file')->processImgURL($program, $this->config->program->editor->create['id'], $this->post->uid); $this->dao->insert(TABLE_PROGRAM)->data($program) ->autoCheck() @@ -860,6 +861,7 @@ class programModel extends model if(isset($this->lang->program->$field)) $this->lang->project->$field = $this->lang->program->$field; } + $this->lang->error->unique = $this->lang->error->repeat; $this->dao->update(TABLE_PROGRAM)->data($program) ->autoCheck($skipFields = 'begin,end') ->batchcheck($this->config->program->edit->requiredFields, 'notempty') diff --git a/module/project/control.php b/module/project/control.php index bbcfb82415..ea1903944f 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -1072,7 +1072,7 @@ class project extends control foreach($teamMembers as $key => $member) $memberPairs[$key] = $member->realname; /* Build the search form. */ - $actionURL = $this->createLink('project', 'bug', "projectID=$projectID&productID=$productID&orderBy=$orderBy&build=$build&type=bysearch&queryID=myQueryID"); + $actionURL = $this->createLink('project', 'bug', "projectID=$projectID&productID=$productID&branchID=$branchID&orderBy=$orderBy&build=$build&type=bysearch&queryID=myQueryID"); $this->loadModel('execution')->buildBugSearchForm($products, $queryID, $actionURL, 'project'); $showBranch = false; diff --git a/module/project/css/team.css b/module/project/css/team.css new file mode 100644 index 0000000000..562ac5d95c --- /dev/null +++ b/module/project/css/team.css @@ -0,0 +1,3 @@ +.c-limited {width: 100px;} +[lang^=de] .c-limited {width: 175px !important;} +.c-actions-1 {width: 80px;} diff --git a/module/project/model.php b/module/project/model.php index 784f29d7eb..fff3a0fe4a 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1190,6 +1190,7 @@ class projectModel extends model if(isset($this->lang->project->$field)) $this->lang->project->$field = $this->lang->project->$field; } + $this->lang->error->unique = $this->lang->error->repeat; $project = $this->loadModel('file')->processImgURL($project, $this->config->project->editor->create['id'], $this->post->uid); $this->dao->insert(TABLE_PROJECT)->data($project) ->autoCheck() @@ -1436,6 +1437,7 @@ class projectModel extends model if(isset($this->lang->project->$field)) $this->lang->project->$field = $this->lang->project->$field; } + $this->lang->error->unique = $this->lang->error->repeat; $this->dao->update(TABLE_PROJECT)->data($project) ->autoCheck($skipFields = 'begin,end') ->batchcheck($requiredFields, 'notempty') diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php index 0194b57fbc..db8759d557 100644 --- a/module/project/view/bug.html.php +++ b/module/project/view/bug.html.php @@ -33,8 +33,9 @@
Build:{$build->name}" : ''; - echo html::a($this->inlink('bug', "projectID={$project->id}&productID={$productID}&branch=$branchID&orderBy=status,id_desc&build=$buildID&type=all"), "{$lang->bug->allBugs}" . ($type == 'all' ? " {$pager->recTotal}$buildName" : ''), '', "id='allTab' class='btn btn-link" . ('all' == $type ? ' btn-active-text' : '') . "'"); - echo html::a($this->inlink('bug', "projectID={$project->id}&productID={$productID}&branch=$branchID&orderBy=status,id_desc&build=$buildID&type=unresolved"), "{$lang->bug->unResolved}" . ($type == 'unresolved' ? " {$pager->recTotal}$buildName" : ''), '', "id='unresolvedTab' class='btn btn-link" . ('unresolved' == $type ? ' btn-active-text' : '') . "'"); + $module = $type != 'bysearch' ? "¶m=$param" : ''; + echo html::a($this->inlink('bug', "projectID={$project->id}&productID={$productID}&branch=$branchID&orderBy=status,id_desc&build=$buildID&type=all$module"), "{$lang->bug->allBugs}" . ($type == 'all' ? " {$pager->recTotal}$buildName" : ''), '', "id='allTab' class='btn btn-link" . ('all' == $type ? ' btn-active-text' : '') . "'"); + echo html::a($this->inlink('bug', "projectID={$project->id}&productID={$productID}&branch=$branchID&orderBy=status,id_desc&build=$buildID&type=unresolved$module"), "{$lang->bug->unResolved}" . ($type == 'unresolved' ? " {$pager->recTotal}$buildName" : ''), '', "id='unresolvedTab' class='btn btn-link" . ('unresolved' == $type ? ' btn-active-text' : '') . "'"); ?> bug->search;?>
diff --git a/module/project/view/team.html.php b/module/project/view/team.html.php index 695bf8ee1c..a128f443b5 100644 --- a/module/project/view/team.html.php +++ b/module/project/view/team.html.php @@ -58,9 +58,9 @@ - + - + diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php index f28acb9dfa..c3920a3f16 100644 --- a/module/release/view/browse.html.php +++ b/module/release/view/browse.html.php @@ -86,9 +86,9 @@
lastStatus) echo $job->lastExec;?> repo}&jobID=$id", '', 'list', 'history'); common::printIcon('job', 'edit', "jobID=$id", '', 'list', 'edit'); common::printIcon('job', 'exec', "jobID=$id", '', 'list', 'play'); if(common::hasPriv('job', 'delete')) echo html::a($this->createLink('job', 'delete', "jobID=$id"), '', 'hiddenwin', "title='{$lang->job->delete}' class='btn'"); diff --git a/module/job/view/edit.html.php b/module/job/view/edit.html.php index 6fd81f22cb..15bd823043 100644 --- a/module/job/view/edit.html.php +++ b/module/job/view/edit.html.php @@ -41,7 +41,7 @@
job->repo; ?>repo, "class='form-control'"); ?>repo, "class='form-control chosen'"); ?>
job->repo; ?>
kanban->columnWidth;?>kanbancolumn->fluidBoardList, isset($copyKanban->fluidBoard) ? $copyKanban->fluidBoard : 0));?>kanbancolumn->fluidBoardList, isset($copyKanban->fluidBoard) ? $copyKanban->fluidBoard : 0));?>
kanban->import?>
kanban->columnWidth;?>kanbancolumn->fluidBoardList, $kanban->fluidBoard));?>kanbancolumn->fluidBoardList, $kanban->fluidBoard));?>
approvalStatus) ? $lang->mr->approvalStatusList['notReviewed'] : $lang->mr->approvalStatusList[$MR->approvalStatus];?> createdBy);?>createdDate);?>createdDate;?> user->admin or (isset($projects[$MR->hostID][$MR->sourceProject]->owner->id) and $projects[$MR->hostID][$MR->sourceProject]->owner->id == $openIDList[$MR->hostID])) ? '' : 'disabled'; diff --git a/module/my/control.php b/module/my/control.php index 95a2e02f76..105f652b11 100755 --- a/module/my/control.php +++ b/module/my/control.php @@ -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(); diff --git a/module/personnel/css/whitelist.css b/module/personnel/css/whitelist.css index 4c4d68cd08..fe83c611e1 100644 --- a/module/personnel/css/whitelist.css +++ b/module/personnel/css/whitelist.css @@ -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;} diff --git a/module/personnel/view/whitelist.html.php b/module/personnel/view/whitelist.html.php index 65ec18427c..1ebc7c4bf9 100644 --- a/module/personnel/view/whitelist.html.php +++ b/module/personnel/view/whitelist.html.php @@ -51,7 +51,7 @@ realname;?> dept);?>user->roleList, $user->role);?>user->roleList, $user->role);?> phone;?> qq;?> weixin;?>team->days;?> team->hours;?> team->totalHours;?>team->limited;?>team->limited;?> actions;?>actions;?>
-
show('right', 'pagerjs');?>
+