diff --git a/module/mr/control.php b/module/mr/control.php index dfe05ebffa..2580ef3d2d 100644 --- a/module/mr/control.php +++ b/module/mr/control.php @@ -283,7 +283,7 @@ class mr extends control $groups = $this->loadModel($scm)->apiGetGroups($MR->hostID, 'name_asc', 'developer'); foreach($groups as $group) $groupIDList[] = $group->id; - $sourceProject = $this->$scm->apiGetSingleProject($MR->hostID, $MR->sourceProject); + $sourceProject = $this->$scm->apiGetSingleProject($MR->hostID, (int)$MR->sourceProject); $isDeveloper = $this->$scm->checkUserAccess($MR->hostID, 0, $sourceProject, $groupIDList, 'developer'); if(!isset($gitUsers[$this->app->user->account]) || !$isDeveloper) return $this->sendError($this->lang->mr->errorLang[3], $this->createLink('mr', 'browse')); diff --git a/module/mr/ui/create.html.php b/module/mr/ui/create.html.php index 4024cd1e70..bb761e6914 100644 --- a/module/mr/ui/create.html.php +++ b/module/mr/ui/create.html.php @@ -41,7 +41,9 @@ formPanel ( set::title($lang->mr->create), set::labelWidth($app->clientLang == 'zh-cn' ? '6em' : '10em'), - count($repoPairs) > 1 ? to::titleSuffix( + count($repoPairs) > 1 ? formGroup( + set::label($lang->repo->common), + set::width('1/2'), picker ( setClass('font-normal w-36'),