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

Browse Source
This commit is contained in:
hufangzhou
2021-08-16 17:29:26 +08:00
parent d63dc92095 84937a6436
commit a33798be71
11 changed files with 89 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/control.php
+35 -2
View File
@@ -172,6 +172,38 @@ class project extends control
echo $html;
}
/**
* Ajax get unlink tips when unlink team member.
*
* @param int $projectID
* @param int $account
* @access public
* @return void
*/
public function ajaxGetUnlinkTips($projectID, $account)
{
$executions = $this->loadModel('execution')->getByProject($projectID, 'undone', 0, true);
$executionMembers = $this->dao->select('t1.root,t2.name')->from(TABLE_TEAM)->alias('t1')
->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.root=t2.id')
->where('t1.root')->in(array_keys($executions))
->andWhere('t1.type')->eq('execution')
->andWhere('t1.account')->eq($account)
->fetchPairs();
$executionNames = '';
$count = 0;
foreach($executionMembers as $executionName)
{
if($count == 0) $executionNames = $executionName;
if($count == 1) $executionNames .= ',' . $executionName;
if($count > 1) break;
$count++;
}
if(count($executionMembers) <= 2) $this->lang->project->etc = ' ';
$this->lang->project->unlinkExecutionMember = sprintf($this->lang->project->unlinkExecutionMember, $executionNames, $this->lang->project->etc, count($executionMembers));
die($this->lang->project->unlinkExecutionMember);
}
/**
* Project index view.
*
@@ -1139,17 +1171,18 @@ class project extends control
* @param int $projectID
* @param int $userID
* @param string $confirm yes|no
* @param string $removeExecution yes|no
* @access public
* @return void
*/
public function unlinkMember($projectID, $userID, $confirm = 'no')
public function unlinkMember($projectID, $userID, $confirm = 'no', $removeExecution = 'no')
{
if($confirm == 'no') die(js::confirm($this->lang->project->confirmUnlinkMember, $this->inlink('unlinkMember', "projectID=$projectID&userID=$userID&confirm=yes")));
$user = $this->loadModel('user')->getById($userID, 'id');
$account = $user->account;
$this->project->unlinkMember($projectID, $account);
$this->project->unlinkMember($projectID, $account, $removeExecution);
if(!dao::isError()) $this->loadModel('action')->create('team', $projectID, 'managedTeam');
/* if ajax request, send result. */
module/project/css/browse.css
+3
View File
@@ -10,3 +10,6 @@ td.c-actions {overflow: visible;}
.icon-cards-view {padding-left: 7px; font-size: 16px;}
.icon-list {padding-left: 7px;}
.panel-actions {position: relative; padding: 0 0;}
td.flex {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center;}
td.flex span.label-danger {margin-left: 5px; min-width: 50px;}
module/project/js/team.js
+35
View File
@@ -2,3 +2,38 @@ function checkUserDept(userID)
{
alert(noAccess);
}
/**
* Delete memeber of project team.
*
* @param projectID $projectID
* @param account $account
* @param userID $userID
* @access public
* @return void
*/
function deleteMemeber(projectID, account, userID)
{
if(confirm(confirmUnlinkMember))
{
var removeConfirm = '';
var tipsLink = createLink('project', 'ajaxGetUnlinkTips', 'projectID=' + projectID + '&account=' + account);
$.get(tipsLink, function(tips)
{
if(confirm(tips))
{
var unlinkURL = createLink('project', 'unlinkMember', 'projectID=' + projectID + '&userID=' + userID + '&confirm=yes&removeExecution=yes');
}
else
{
var unlinkURL = createLink('project', 'unlinkMember', 'projectID=' + projectID + '&userID=' + userID + '&confirm=yes&removeExecution=no');
}
$.get(unlinkURL, function(data)
{
data = JSON.parse(data);
if(data.result == 'success') window.location.reload();
});
})
}
}
module/project/lang/zh-cn.php
+2
View File
@@ -129,6 +129,7 @@ $lang->project->longTime = '长期';
$lang->project->future = '待定';
$lang->project->moreProject = '更多项目';
$lang->project->days = '可用工作日';
$lang->project->etc = "等";
$lang->project->productNotEmpty = '请关联产品或创建产品。';
$lang->project->existProductName = '产品名称已存在。';
@@ -138,6 +139,7 @@ $lang->project->linkedProjectsTip = '关联的项目如下';
$lang->project->multiLinkedProductsTip = '该项目关联的如下产品还关联了其他项目，请取消关联后再操作';
$lang->project->linkStoryByPlanTips = "此操作会将所选计划下面的{$lang->SRCommon}全部关联到此项目中";
$lang->project->createExecution = "该项目下没有{$lang->executionCommon}，请先创建{$lang->executionCommon}";
$lang->project->unlinkExecutionMember = "该用户参与了%s%s%s个{$lang->executionCommon}，是否同时将其移除？（该用户所产生的数据不会受影响。）";
$lang->project->tenThousand = '万';
module/project/model.php
+10 -3
View File
@@ -1261,13 +1261,20 @@ class projectModel extends model
*
* @param int $projectID
* @param string $account
* @param string $removeExecution no|yes
* @access public
* @return void
*/
public function unlinkMember($projectID, $account)
public function unlinkMember($projectID, $account, $removeExecution = 'no')
{
$this->dao->delete()->from(TABLE_TEAM)->where('root')->eq((int)$projectID)->andWhere('type')->eq('project')->andWhere('account')->eq($account)->exec();
if($removeExecution == 'yes')
{
$executions = $this->loadModel('execution')->getByProject($projectID, 'undone', 0, true);
$this->dao->delete()->from(TABLE_TEAM)->where('root')->in(array_keys($executions))->andWhere('type')->eq('execution')->andWhere('account')->eq($account)->exec();
}
$this->loadModel('user');
$this->user->updateUserView($projectID, 'project', array($account));
@@ -1356,7 +1363,7 @@ class projectModel extends model
if($id == 'name')
{
$class .= ' text-left';
$class .= ' text-left flex';
$title = "title='{$project->name}'";
}
@@ -1399,7 +1406,7 @@ class projectModel extends model
if($project->model === 'waterfall') echo "<span class='project-type-label label label-outline label-warning'>{$this->lang->project->waterfall}</span> ";
if($project->model === 'scrum') echo "<span class='project-type-label label label-outline label-info'>{$this->lang->project->scrum}</span> ";
}
echo html::a($projectLink, $project->name);
echo html::a($projectLink, $project->name, '', "class='text-ellipsis'");
if(isset($project->delay)) echo "<span class='label label-danger label-badge'>{$this->lang->project->statusList['delay']}</span>";
break;
case 'PM':
module/project/view/team.html.php
+1 -2
View File
@@ -91,8 +91,7 @@
<?php
if (common::hasPriv('project', 'unlinkMember', $member))
{
$unlinkURL = $this->createLink('project', 'unlinkMember', "projectID=$projectID&userID=$member->userID&confirm=yes");
echo html::a("javascript:ajaxDelete(\"$unlinkURL\", \"mainContent\", confirmUnlinkMember)", '<i class="icon-green-project-unlinkMember icon-unlink"></i>', '', "class='btn' title='{$lang->project->unlinkMember}'");
echo html::a("javascript:deleteMemeber($projectID, \"{$member->account}\", \"{$member->userID}\")", '<i class="icon-green-project-unlinkMember icon-unlink"></i>', '', "class='btn' title='{$lang->project->unlinkMember}'");
}
?>
</td>
www/theme/zui/css/min.css
+2 -2
View File
File diff suppressed because one or more lines are too long
www/theme/zui/fonts/ZentaoIcon.eot
BIN
View File
Binary file not shown.
www/theme/zui/fonts/ZentaoIcon.svg
+1 -1
View File
@@ -155,7 +155,7 @@
<glyph unicode="&#xe98c;" glyph-name="audit" d="M652.869 352.584c125.552 0 225.993-100.441 225.993-225.993 0-44.195-12.556-85.877-34.652-120.529l154.68-155.684-69.807-69.807-156.689 154.178c-34.652-21.596-75.834-34.149-119.526-34.149-125.552 0-225.993 100.441-225.993 225.993s100.441 225.993 225.993 225.993zM652.869 252.144c-69.304 0-125.552-56.248-125.552-125.552s56.248-125.552 125.552-125.552c69.304 0 125.552 56.248 125.552 125.552s-56.248 125.552-125.552 125.552zM125.552 804.571h703.090c55.745 0 100.441-44.697 100.441-100.441v-403.272c-25.11 40.176-59.763 74.829-100.441 101.948v301.324h-703.090v-703.090h225.993c15.569-37.665 38.168-71.314 65.789-100.441h-291.782c-55.745 0-100.441 44.697-100.441 100.441v703.090c0 55.745 44.697 100.441 100.441 100.441zM225.993 603.688h502.208v-100.441h-502.208v100.441zM225.993 402.805h252.61c-40.176-25.11-74.829-59.763-101.948-100.441h-150.663v100.441zM225.993 201.922h108.979c-5.524-25.11-8.537-50.221-8.537-75.331v-25.11h-100.441v100.441z" />
<glyph unicode="&#xe98d;" glyph-name="manual" d="M749.977 734.89c141.995 0 248.287-57.207 254.499-59.392 11.605-4.096 19.387-15.019 19.524-27.375v-768.889c0.020-15.986-12.922-28.962-28.908-28.982-2.171 0-4.337 0.239-6.455 0.72-1.843 0.409-121.446 41.37-236.612 41.37-90.795 0-212.924-33.382-214.357-33.792-7.85-2.117-14.336-2.731-22.050-3.959-7.45 0.683-14.827 2.008-22.050 3.959-1.365 0.409-80.76 33.792-233.608 33.792-93.867 0-223.232-41.097-224.598-41.37-15.635-3.507-31.153 6.327-34.659 21.962-0.469 2.091-0.703 4.227-0.703 6.369v768.82c0 12.425 7.919 23.279 19.524 27.443 6.212 2.253 109.090 59.324 233.677 59.324 124.655 0 253.133-50.654 258.526-52.77 1.247-0.531 2.456-1.147 3.618-1.843 1.2 0.671 2.43 1.286 3.686 1.843 5.461 2.117 88.951 52.77 230.946 52.77v0zM253.268 666.214c-100.967 0-142.472-24.166-163.704-35.226-12.152-6.349-21.231-14.882-21.231-27.853l0.341-637.543c0-17.954 16.111-31.539 33.792-28.536 57.276 9.899 87.245 25.532 157.559 25.532 93.184 0 126.43-15.019 183.637-25.532 15.674-2.94 30.766 7.382 33.706 23.057 0.33 1.761 0.496 3.55 0.495 5.342l1.843 637.816c-0.006 12.731-8.312 23.971-20.481 27.716-48.128 14.404-105.132 35.226-206.029 35.226h0.070zM752.093 666.213c-101.034 0-136.192-24.986-184.116-39.594-12.239-3.644-20.644-14.878-20.684-27.648v-630.716c0-18.090 16.384-31.676 34.202-28.399 54.204 10.035 83.081 19.593 170.667 22.733 77.619 2.867 112.298-12.97 169.574-22.869 15.76-2.676 30.706 7.929 33.383 23.69 0.272 1.601 0.408 3.222 0.408 4.846l1.365 630.579c0 12.97-9.011 20.753-21.163 27.853-48.196 28.126-82.602 39.527-183.637 39.527v0zM398.472 189.165c6.144 0 11.128-8.875 11.128-19.729v-28.809c-0.136-10.923-5.12-19.729-11.264-19.729h-250.676c-6.144 0-11.128 8.875-11.128 19.729v28.809c0 10.923 4.984 19.729 11.128 19.729h250.812zM876.339 189.165c6.144 0 11.128-8.875 11.128-19.729v-28.809c-0.136-10.923-4.984-19.729-11.128-19.729h-250.812c-6.144 0-11.128 8.875-11.128 19.729v28.809c0 10.923 4.984 19.729 11.128 19.729h250.812zM398.472 325.699c6.144 0 11.128-8.875 11.128-19.729v-28.809c-0.136-10.923-5.12-19.729-11.264-19.729h-250.676c-6.144 0-11.128 8.875-11.128 19.729v28.809c0 10.923 4.984 19.729 11.128 19.729h250.812zM876.339 325.699c6.144 0 11.128-8.875 11.128-19.729v-28.809c-0.136-10.923-4.984-19.729-11.128-19.729h-250.812c-6.144 0-11.128 8.875-11.128 19.729v28.809c0 10.923 4.984 19.729 11.128 19.729h250.812zM398.472 462.232c6.144 0 11.128-8.875 11.128-19.729v-28.809c-0.136-10.923-5.12-19.729-11.264-19.729h-250.676c-6.144 0-11.128 8.875-11.128 19.729v28.809c0 10.923 4.984 19.729 11.128 19.729h250.812zM876.339 462.232c6.144 0 11.128-8.875 11.128-19.729v-28.809c-0.136-10.923-4.984-19.729-11.128-19.729h-250.812c-6.144 0-11.128 8.875-11.128 19.729v28.809c0 10.923 4.984 19.729 11.128 19.729h250.812z" />
<glyph unicode="&#xe98e;" glyph-name="split" d="M577.408 414.332c68.685 26.315 117.449 92.868 117.449 170.811 0 100.989-81.869 182.857-182.857 182.857s-182.857-81.868-182.857-182.857c0-77.942 48.764-144.495 117.449-170.811l-238.596-306.768c-8.167 1.412-16.567 2.15-25.138 2.15-80.791 0-146.286-65.496-146.286-146.286s65.494-146.286 146.286-146.286c80.791 0 146.286 65.496 146.286 146.286 0 45.319-20.609 85.826-52.966 112.658l199.252 256.183v-227.163c-63.093-16.241-109.714-73.516-109.714-141.678 0-80.79 65.496-146.286 146.286-146.286s146.286 65.496 146.286 146.286c0 68.162-46.621 125.436-109.714 141.678v227.163l199.252-256.183c-32.358-26.832-52.966-67.339-52.966-112.658 0-80.79 65.496-146.286 146.286-146.286s146.286 65.496 146.286 146.286c0 80.79-65.496 146.286-146.286 146.286-8.572 0-16.973-0.739-25.139-2.15l-238.596 306.768zM512 475.428c-60.595 0-109.714 49.121-109.714 109.714s49.119 109.714 109.714 109.714c60.595 0 109.714-49.121 109.714-109.714s-49.119-109.714-109.714-109.714zM109.714-36.572c0 40.397 32.747 73.143 73.143 73.143s73.143-32.746 73.143-73.143c0-40.397-32.747-73.143-73.143-73.143s-73.143 32.746-73.143 73.143zM512-109.715c-40.397 0-73.143 32.746-73.143 73.143s32.746 73.143 73.143 73.143c40.397 0 73.143-32.746 73.143-73.143s-32.746-73.143-73.143-73.143zM841.143-109.715c-40.397 0-73.143 32.746-73.143 73.143s32.746 73.143 73.143 73.143c40.397 0 73.143-32.746 73.143-73.143s-32.746-73.143-73.143-73.143z" />
<glyph unicode="&#xe98f;" glyph-name="lightbulb-alt, product" d="M512 804.571c222.46 0 402.286-186.025 402.286-414.893 0-159.142-87.721-301.529-221.873-370.944l-34.625-207.604c-2.694-16.165-15.739-28.372-31.665-30.295l-4.409-0.265h-219.429c-16.388 0-30.574 10.86-35.088 26.253l-0.986 4.306-34.625 207.604c-134.152 69.414-221.873 211.802-221.873 370.944 0 228.868 179.826 414.893 402.286 414.893zM615.095 0h-206.226l24.393-146.286h157.44l24.393 146.286zM512 731.428c-181.499 0-329.143-152.734-329.143-341.75 0-142.826 85.124-268.864 211.14-319.139l-6.23 2.603h248.43l3.418 1.412c117.537 51.345 197.247 169.522 201.361 304.171v0l0.167 10.953c0 189.017-147.644 341.75-329.143 341.75zM658.286 512c18.755 0 34.213-14.118 36.325-32.306l0.246-4.265v-146.286c0-25.756-25.678-42.981-49.056-34.385l-3.87 1.675-129.93 64.966-129.93-64.966c-23.037-11.518-49.927 3.745-52.694 28.5l-0.233 4.211v146.286c0 20.198 16.374 36.571 36.571 36.571 18.755 0 34.213-14.118 36.325-32.306l0.246-4.265v-87.077l93.359 46.644c8.825 4.413 18.989 5.043 28.197 1.891l4.513-1.891 93.359-46.681v87.113c0 18.755 14.118 34.213 32.306 36.325l4.265 0.246z" />
<glyph unicode="&#xe98f;" glyph-name="lightbulb-alt, product" d="M602.619 3.097h-181.241c-64.286 0-116.496 51.865-116.496 115.461v17.136c0 13.225-6.096 25.529-16.56 33.81-41.515 32.661-75.785 74.635-99.246 121.44-24.61 49.221-37.031 102.235-37.031 157.552 0 47.84 9.659 94.53 28.75 138.576 18.286 42.32 44.505 80.384 77.739 113.161 33.81 33.234 73.141 59.339 116.725 77.28 45.31 18.631 93.264 27.714 142.37 27.024 94.875-1.495 183.886-39.099 250.585-105.915 66.93-67.045 103.73-155.826 103.73-250.011 0-55.314-12.535-108.329-37.145-157.666-23.461-46.919-57.845-88.896-99.36-121.554-10.35-8.165-16.329-20.354-16.329-33.579v-17.136c0-63.71-52.325-115.575-116.496-115.575zM512.114 735.65c-38.064 0-75.209-7.36-110.4-21.849-35.419-14.606-67.275-35.65-94.645-62.674-55.545-54.51-86.021-126.501-86.021-202.517 0-87.975 40.021-169.856 109.941-224.711 27.255-21.504 43.010-53.591 43.010-88.089v-17.136c0-25.646 21.275-46.459 47.495-46.459h181.241c26.219 0 47.495 20.816 47.495 46.459v17.136c0 34.501 15.525 66.585 42.779 87.861 70.034 54.855 110.169 136.85 110.169 224.942 0 75.785-29.671 147.317-83.605 201.367s-125.925 84.526-202.745 85.675h-4.715zM639.65-103.278h-255.301c-19.090 0-34.501 15.41-34.501 34.501s15.41 34.501 34.501 34.501h255.301c19.090 0 34.501-15.41 34.501-34.501s-15.41-34.501-34.501-34.501zM594.224-219.429h-164.45c-19.090 0-34.501 15.41-34.501 34.501s15.41 34.501 34.501 34.501h164.45c19.090 0 34.501-15.41 34.501-34.501s-15.41-34.501-34.501-34.501zM466.576 243.446c-9.2 0-18.286 3.68-25.184 10.809-13.111 13.915-12.421 35.765 1.495 48.759l91.081 85.675-155.595-38.871c-15.179-3.794-31.049 3.104-38.64 16.791s-4.944 30.821 6.325 41.63l184.576 176.411c13.799 13.111 35.65 12.649 48.761-1.15s12.649-35.65-1.15-48.761l-90.391-86.366 157.552 39.445c15.179 3.794 31.166-3.104 38.64-16.905s4.83-30.935-6.67-41.63l-187.221-176.411c-6.67-6.325-15.065-9.431-23.575-9.431v0z" />
<glyph unicode="&#xe990;" glyph-name="code" d="M354.115 28.317l-74.676-54.739-279.438 319.376 279.438 318.611 74.644-54.835-231.43-263.839 231.462-264.573zM669.886 28.317l231.462 264.573-231.43 263.839 74.644 54.835 279.438-318.611-279.438-319.376-74.676 54.739zM521.714 582.153l92.891-19.523-116.592-568.19-92.891 19.523 116.592 568.19z" />
<glyph unicode="&#xe991;" glyph-name="feedback" d="M804.571 731.428c18.755 0 34.213-14.118 36.325-32.306l0.246-4.265v-363.959l55.629 30.349c23.152 12.63 51.127-2.658 53.867-28.019l0.218-4.086v-438.857c0-20.198-16.374-36.571-36.571-36.571v0h-804.571c-20.198 0-36.571 16.374-36.571 36.571v0 438.857c0 27.759 29.712 45.398 54.082 32.107v0l55.632-30.351v363.959c0 18.755 14.118 34.213 32.306 36.325l4.265 0.246h585.143zM877.714 267.593l-348.147-189.984c-10.915-5.955-24.109-5.955-35.025-0.002v0l-348.257 189.949v-340.699h731.429v340.736zM768 658.285h-512v-367.287l256.037-139.63 255.963 139.63v367.287zM548.571 402.285c20.198 0 36.571-16.374 36.571-36.571 0-18.755-14.118-34.213-32.306-36.325l-4.265-0.246h-182.857c-20.198 0-36.571 16.374-36.571 36.571 0 18.755 14.118 34.213 32.306 36.325l4.265 0.246h182.857zM658.286 548.571c20.198 0 36.571-16.374 36.571-36.571 0-18.755-14.118-34.213-32.306-36.325l-4.265-0.246h-292.571c-20.198 0-36.571 16.374-36.571 36.571 0 18.755 14.118 34.213 32.306 36.325l4.265 0.246h292.571z" />
<glyph unicode="&#xe992;" glyph-name="account" d="M869.899-72.308v0c-125.27-122.901-304.776-173.043-475.603-132.854v0c-183.049 53.789-326.315 196.759-380.481 379.696v0c-64.959 275.074 105.374 550.724 380.448 615.682 77.563 18.317 158.332 18.265 235.871-0.15v0c183.202-53.529 326.573-196.605 380.481-379.696v0c40.648-174.427-12.701-357.422-140.716-482.678v0zM512.215-145.417v0c100.145-0.606 197.394 33.569 275.142 96.693v0c-50.745 151.957-215.067 234.006-367.024 183.26-86.496-28.885-154.376-96.763-183.26-183.26v0c77.908-62.837 175.053-96.976 275.142-96.693v0zM417.88 719.315v0c-236.026-52.66-384.672-286.685-332.012-522.711 15.767-70.668 48.812-136.322 96.177-191.087v0c84.791 183.217 302.053 263.007 485.27 178.215 78.653-36.4 141.816-99.562 178.215-178.215v0c159.45 181.815 141.321 458.465-40.494 617.915-105.873 92.851-249.941 129.115-387.156 97.455l0.001-1.571zM557.809 261.794v0c-97.503-25.276-197.035 33.275-222.311 130.776-7.726 29.804-7.782 61.079-0.161 90.909v0c15.984 64.906 66.473 115.698 131.281 132.068v0c98.074 24.794 197.679-34.612 222.472-132.687 7.448-29.465 7.448-60.32 0-89.785v0c-15.92-64.782-66.501-115.362-131.281-131.281v0.001zM512.214 547.941v0c-60.781 0.432-110.405-48.49-110.837-109.271s48.49-110.405 109.271-110.837c60.781-0.432 110.405 48.49 110.837 109.271 0.003 0.522 0.003 1.045 0 1.566v0c0 60.349-48.922 109.273-109.271 109.273 0 0 0 0 0 0v-0.003z" />
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 188 KiB

After

Width:  |  Height:  |  Size: 189 KiB

www/theme/zui/fonts/ZentaoIcon.ttf
BIN
View File
Binary file not shown.
www/theme/zui/fonts/ZentaoIcon.woff
BIN
View File
Binary file not shown.