From 4b53f349dff38ad97c6ddbe59c221b34d477102a Mon Sep 17 00:00:00 2001 From: zenggang Date: Fri, 3 Dec 2021 01:59:04 +0000 Subject: [PATCH] * Fix bug#16736,17037,16844 --- module/action/lang/en.php | 5 +++-- module/action/lang/zh-cn.php | 5 +++-- module/gitlab/lang/zh-cn.php | 4 ++-- module/gitlab/view/createuser.html.php | 2 +- module/gitlab/view/edituser.html.php | 2 +- module/mr/model.php | 4 +++- www/theme/default/images/repo/avatar.jpeg | Bin 0 -> 1661 bytes 7 files changed, 13 insertions(+), 9 deletions(-) create mode 100755 www/theme/default/images/repo/avatar.jpeg diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 995f6f1315..c74205da6d 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -291,8 +291,9 @@ $lang->action->label->syncprogram = 'start'; $lang->action->label->syncproject = 'start'; $lang->action->label->syncexecution = 'start'; $lang->action->label->startProgram = '(The start of the project sets the status of the program as Ongoing)'; -$lang->action->label->createmr = 'MR Linked'; -$lang->action->label->mergedmr = 'MR Merged'; +$lang->action->label->createmr = 'Merge Request Linked'; +$lang->action->label->deletemr = 'Merge Request Unlinked'; +$lang->action->label->mergedmr = 'Merge Request Merged'; $lang->action->label->reopen = 'Reopen'; $lang->action->label->approve = 'Passed'; $lang->action->label->reject = 'Rejected'; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index d2b01cec78..faa68264d0 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -294,8 +294,9 @@ $lang->action->label->syncprogram = '开始了'; $lang->action->label->syncproject = '开始了'; $lang->action->label->syncexecution = '开始了'; $lang->action->label->startProgram = '（因项目开始而启动项目集）'; -$lang->action->label->createmr = 'MR关联了'; -$lang->action->label->mergedmr = 'MR合并了'; +$lang->action->label->createmr = '合并请求关联了'; +$lang->action->label->deletemr = '合并请求取消了'; +$lang->action->label->mergedmr = '合并请求合并了'; $lang->action->label->compilepass = '构建成功'; $lang->action->label->compilefail = '构建失败'; $lang->action->label->reopen = '重新打开'; diff --git a/module/gitlab/lang/zh-cn.php b/module/gitlab/lang/zh-cn.php index c6720eb628..940581f9f6 100644 --- a/module/gitlab/lang/zh-cn.php +++ b/module/gitlab/lang/zh-cn.php @@ -114,9 +114,9 @@ $lang->gitlab->user = new stdclass; $lang->gitlab->user->id = "用户ID"; $lang->gitlab->user->name = "名称"; $lang->gitlab->user->username = "用户名"; -$lang->gitlab->user->email = "电子邮件"; +$lang->gitlab->user->email = "邮箱"; $lang->gitlab->user->password = "密码"; -$lang->gitlab->user->passwordRepeat = "重复密码"; +$lang->gitlab->user->passwordRepeat = "请重复密码"; $lang->gitlab->user->projectsLimit = "限制项目"; $lang->gitlab->user->canCreateGroup = "可创建组"; $lang->gitlab->user->external = "外部人员"; diff --git a/module/gitlab/view/createuser.html.php b/module/gitlab/view/createuser.html.php index 5b0219ed80..452e83f495 100644 --- a/module/gitlab/view/createuser.html.php +++ b/module/gitlab/view/createuser.html.php @@ -72,7 +72,7 @@ gitlab->user->avatar;?>
- ' ', 'account'=>''), 50); ?> + $defaultTheme . 'images/repo/avatar.jpeg', 'account'=>''), 50); ?> ', '', "class='btn-avatar' id='avatarUploadBtn' data-toggle='tooltip' data-container='body' data-placement='bottom' title='{$lang->gitlab->user->avatar}'");?>
diff --git a/module/gitlab/view/edituser.html.php b/module/gitlab/view/edituser.html.php index 105585c933..baaa4d07cc 100644 --- a/module/gitlab/view/edituser.html.php +++ b/module/gitlab/view/edituser.html.php @@ -73,7 +73,7 @@ gitlab->user->avatar;?>
- $user->avatar_url, 'account'=>''), 50); ?> + $user->avatar_url ? $user->avatar_url : $defaultTheme . 'images/repo/avatar.jpeg', 'account'=>''), 50); ?> ', '', "class='btn-avatar' id='avatarUploadBtn' data-toggle='tooltip' data-container='body' data-placement='bottom' title='{$lang->gitlab->user->avatar}'");?>
diff --git a/module/mr/model.php b/module/mr/model.php index 584a84bfc2..5ff5ec1588 100644 --- a/module/mr/model.php +++ b/module/mr/model.php @@ -1080,7 +1080,9 @@ class mrModel extends model */ public function unlink($MRID, $productID, $type, $linkID) { - return $this->dao->delete()->from(TABLE_RELATION)->where('product')->eq($productID)->andWhere('AType')->eq('mr')->andWhere('AID')->eq($MRID)->andWhere('BType')->eq($type)->andWhere('BID')->eq($linkID)->exec(); + $this->dao->delete()->from(TABLE_RELATION)->where('product')->eq($productID)->andWhere('AType')->eq('mr')->andWhere('AID')->eq($MRID)->andWhere('BType')->eq($type)->andWhere('BID')->eq($linkID)->exec(); + + $this->loadModel('action')->create($type, $linkID, 'deletemr'); } /** diff --git a/www/theme/default/images/repo/avatar.jpeg b/www/theme/default/images/repo/avatar.jpeg new file mode 100755 index 0000000000000000000000000000000000000000..f5a481dc6fc361dfca5c4f978d480173ed0d25ad GIT binary patch literal 1661 zcmbW$c~Fx_6aeu3@`WUPwLl<*!y{k<1P~QLr7#E)6FEfWEJ2ELi4rS^a;UXYte{`9 z6i^hfTv3U^pdz=zNH|0e1q9TfRRokv1WZ6cNrQImOlLaN_U*jC_RY@w?e3F3mc0Nf zjw}ZjfFKCi%NLOK06T!gD&Q2bIGh3wkH--Z6$DXKL`X`?i&Qj7nwlCUGFf}69z}aG zbqSfQvqFceZ(wL-s6{bZZ9-qIM>nJ|90K9-c!YqcA&44Xo2*U$&mp@5hy)M>f?#Ml zzz`vr2+8UI1pr7v-t9uee+Gns<^AFbipW>;f)W*gfnXSeg%uRASb6mk`98oB6;yRi z88|gpfBfdrLCuLKsPipU%PI-#W$9Ao0zQ4 z_70Bj9-dy`db523gMxR3?A{Z)|3Fl9Ozgo!$A3BzpK$UNnv#0vY}&c==^1&vi$Tag_y@>_dC)vM)#r-eY7ua7eF<1mc^2dXTzy{1lqx2jMN~Zw_9jG${&;`zX z>b(Im@2SlkeC&N^!7`qKl}YciL?_BaG+MoxM0z^s2tYR=oey z3=w^_h3{b%O}M%zTbMnOY)4(TW*!d zw#1KZDE@)@H94IVqoHcI&TPIJPM$?xkM8T31Vc50&4Z!c{MJEVLeI--qvxSupqhGp*5sCR zA-H6}%@`?2dqka-YFTUIC}%w!(&~|}wkTq-8SS`fqpiVQes>XHpljAnzxo~Qp_bRP zh5G{!;oi1sC@omG`!|vNYU=%T6E>BKHypmFVVdth-#(QSvcB)RYSyRp{#@WR)xezjI^^<8^NqxNuQ z#`m4C=Y1SWM@U?0tKnXYu_%cvlab?Pb5b}hO63n&gyqVBjc~7f5Hne8NwD`$bkC`R z3(o4CZN(g`xYJEpo>ffC2hNqZYEWvi45)=0jfDh+DJ2e%&*5aC%{kgLoj2qZn7*{E zg=O{&m=apXOU=IVx`-NyF`ch%LaR3skQon({zs$wWNMRC#ohKcgw!i&WBo=@+KSf{B1ofR$NV2tzl zfD-bg>)Qk?xzn23;J}WSr z*mRD0B%d07-{_@<|6P2Cpxsu3E*LRZy8W=Ow%i;tQKwv}mc)lKX4