* Merge 18 devopos to 20

2023-10-07 03:03:28 +00:00
parent 4e535ae301
commit 10a61396a1
196 changed files with 3646 additions and 940 deletions
@@ -24,6 +24,8 @@ featureBar
 toolbar();

 jsVar('zentaoUsers', $zentaoUsers);
+jsVar('gitlabID', $gitlabID);
+jsVar('type', $type);
 $config->gitlab->dtable->bindUser->fieldList['gitlabEmail']['onRenderCell'] = jsRaw('renderGitlabUser');
 $config->gitlab->dtable->bindUser->fieldList['zentaoUsers']['controlItems'] = $userPairs;
 form
@@ -48,7 +50,7 @@ form
                array(
                    'text'    => $lang->save,
                    'btnType' => 'primary',
-                    'onClick' => jsRaw("() => {\$('#bindForm').trigger('submit')}")
+                    'onClick' => jsRaw("() => {bindUser()}")
                ),
                array(
                    'text'    => $lang->goback,