From 21b0217aa8ac4b86369869a33ed52b65d0d16b3a Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Wed, 22 Jun 2022 13:15:44 +0800 Subject: [PATCH] * Code for task#57850. --- module/bug/view/confirmbug.html.php | 2 +- module/bug/view/create.html.php | 2 +- module/bug/view/edit.html.php | 2 +- module/custom/view/set.html.php | 20 ++++++++++---------- module/doc/view/create.html.php | 6 +++--- module/doc/view/createlib.html.php | 4 ++-- module/doc/view/edit.html.php | 6 +++--- module/doc/view/editlib.html.php | 4 ++-- module/execution/control.php | 2 +- module/execution/js/create.js | 2 +- module/execution/view/create.html.php | 4 ++-- module/execution/view/edit.html.php | 4 ++-- module/group/view/manageview.html.php | 8 ++++---- module/kanban/view/create.html.php | 4 ++-- module/kanban/view/createspace.html.php | 4 ++-- module/kanban/view/edit.html.php | 4 ++-- module/kanban/view/editspace.html.php | 4 ++-- module/product/view/edit.html.php | 4 ++-- module/program/view/create.html.php | 2 +- module/program/view/edit.html.php | 2 +- module/project/view/create.html.php | 4 ++-- module/project/view/edit.html.php | 4 ++-- module/projectrelease/view/create.html.php | 2 +- module/projectrelease/view/edit.html.php | 16 ++++++++-------- module/release/view/create.html.php | 2 +- module/release/view/edit.html.php | 2 +- module/repo/view/create.html.php | 4 ++-- module/repo/view/edit.html.php | 4 ++-- module/story/view/batchcreate.html.php | 2 +- module/story/view/change.html.php | 2 +- module/story/view/create.html.php | 4 ++-- module/story/view/edit.html.php | 4 ++-- module/task/view/edit.html.php | 2 +- module/testcase/view/edit.html.php | 2 +- module/testreport/view/create.html.php | 2 +- module/testreport/view/edit.html.php | 2 +- module/testtask/view/create.html.php | 4 ++-- module/testtask/view/edit.html.php | 4 ++-- module/user/control.php | 2 +- 39 files changed, 79 insertions(+), 79 deletions(-) diff --git a/module/bug/view/confirmbug.html.php b/module/bug/view/confirmbug.html.php index 24bdf535d4..9320eb9e9e 100755 --- a/module/bug/view/confirmbug.html.php +++ b/module/bug/view/confirmbug.html.php @@ -53,7 +53,7 @@ js::set('page', 'confirmbug'); printExtendFields($bug, 'table');?> bug->mailto;?> - mailto), 'class="form-control chosen" multiple');?> + mailto), 'class="form-control picker-select" multiple');?> comment;?> diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php index bbe93e1786..c14dcda43a 100644 --- a/module/bug/view/create.html.php +++ b/module/bug/view/create.html.php @@ -333,7 +333,7 @@ if($this->app->tab == 'project') js::set('objectID', $projectID);
fetch('my', 'buildContactLists'); ?>
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php index e3ad814810..61d52d2fec 100644 --- a/module/bug/view/edit.html.php +++ b/module/bug/view/edit.html.php @@ -186,7 +186,7 @@ if($this->app->tab == 'project') js::set('objectID', $bug->project); bug->mailto;?>
- mailto), 'class="form-control chosen" multiple');?> + mailto), 'class="form-control picker-select" multiple');?> fetch('my', 'buildContactLists');?>
diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php index b13a894ab6..5e784588de 100644 --- a/module/custom/view/set.html.php +++ b/module/custom/view/set.html.php @@ -92,7 +92,7 @@ EOT; custom->superReviewers;?> - + @@ -112,39 +112,39 @@ EOT; custom->forceReview . $space . $lang->custom->account;?> - + custom->forceReview . $space . $lang->custom->role;?> - user->roleList, $forceReviewRoles, "class='form-control chosen' multiple");?> + user->roleList, $forceReviewRoles, "class='form-control picker-select' multiple");?> custom->forceReview . $space . $lang->custom->dept;?> - + custom->forceNotReview . $space . $lang->custom->account;?> - + custom->forceNotReview . $space . $lang->custom->role;?> - user->roleList, $forceNotReviewRoles, "class='form-control chosen' multiple");?> + user->roleList, $forceNotReviewRoles, "class='form-control picker-select' multiple");?> custom->forceNotReview . $space . $lang->custom->dept;?> - + > custom->forceReview;?> - + custom->notice->forceReview, $lang->$module->common);?> > custom->forceNotReview;?> - + custom->notice->forceNotReview, $lang->$module->common);?> @@ -212,7 +212,7 @@ EOT; - + diff --git a/module/doc/view/create.html.php b/module/doc/view/create.html.php index 0c72c691aa..ad01e5b513 100644 --- a/module/doc/view/create.html.php +++ b/module/doc/view/create.html.php @@ -99,7 +99,7 @@ $("a[href^='###']").click(function() diff --git a/module/doc/view/createlib.html.php b/module/doc/view/createlib.html.php index 0c78b22518..4379b9216f 100644 --- a/module/doc/view/createlib.html.php +++ b/module/doc/view/createlib.html.php @@ -69,11 +69,11 @@ diff --git a/module/doc/view/edit.html.php b/module/doc/view/edit.html.php index bb1a1fa5d7..8f349094d9 100644 --- a/module/doc/view/edit.html.php +++ b/module/doc/view/edit.html.php @@ -75,7 +75,7 @@ diff --git a/module/doc/view/editlib.html.php b/module/doc/view/editlib.html.php index 67fb26cb1e..8f83ca769f 100644 --- a/module/doc/view/editlib.html.php +++ b/module/doc/view/editlib.html.php @@ -66,11 +66,11 @@ diff --git a/module/execution/control.php b/module/execution/control.php index 16bcba9dba..7562a13161 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -3203,7 +3203,7 @@ class execution extends control $users = $this->loadModel('user')->getPairs('nodeleted|noclosed'); $members = $this->user->getTeamMemberPairs($objectID, $type); - return print(html::select('teamMembers[]', $users, array_keys($members), "class='form-control chosen' multiple")); + return print(html::select('teamMembers[]', $users, array_keys($members), "class='form-control picker-select' multiple")); } /** diff --git a/module/execution/js/create.js b/module/execution/js/create.js index ae1df4888e..ebe95ee6ec 100644 --- a/module/execution/js/create.js +++ b/module/execution/js/create.js @@ -69,7 +69,7 @@ $(function() $.get(createLink('execution', 'ajaxGetTeamMembers', 'objectID=' + objectID), function(data) { $('#teamMembers').parent().html(data); - $('#teamMembers').chosen(); + $('#teamMembers').picker({chosenMode: true}); }); }) diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php index a38a8e0500..d860567eab 100644 --- a/module/execution/view/create.html.php +++ b/module/execution/view/create.html.php @@ -217,7 +217,7 @@ - + @@ -234,7 +234,7 @@ diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php index 6106f73c6d..0c16deb82c 100644 --- a/module/execution/view/edit.html.php +++ b/module/execution/view/edit.html.php @@ -191,7 +191,7 @@ - + @@ -207,7 +207,7 @@ diff --git a/module/group/view/manageview.html.php b/module/group/view/manageview.html.php index 46395fa68f..2dc3f8d899 100644 --- a/module/group/view/manageview.html.php +++ b/module/group/view/manageview.html.php @@ -52,7 +52,7 @@ @@ -56,7 +56,7 @@ - + diff --git a/module/kanban/view/createspace.html.php b/module/kanban/view/createspace.html.php index 795511426c..0f3fac5fbb 100644 --- a/module/kanban/view/createspace.html.php +++ b/module/kanban/view/createspace.html.php @@ -35,7 +35,7 @@ @@ -48,7 +48,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/module/kanban/view/editspace.html.php b/module/kanban/view/editspace.html.php index 02b097a6b4..0e8a03c1d4 100644 --- a/module/kanban/view/editspace.html.php +++ b/module/kanban/view/editspace.html.php @@ -36,7 +36,7 @@ @@ -49,7 +49,7 @@ - + - + @@ -92,7 +92,7 @@ diff --git a/module/program/view/create.html.php b/module/program/view/create.html.php index f841535baa..28ff2ac3cb 100644 --- a/module/program/view/create.html.php +++ b/module/program/view/create.html.php @@ -120,7 +120,7 @@ diff --git a/module/program/view/edit.html.php b/module/program/view/edit.html.php index 9a7738253b..39a281adbc 100644 --- a/module/program/view/edit.html.php +++ b/module/program/view/edit.html.php @@ -102,7 +102,7 @@ diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index b5abf24283..21b48a5f4c 100755 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -159,7 +159,7 @@ - + @@ -177,7 +177,7 @@ diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php index 4aa4cf4891..194c086fe7 100755 --- a/module/project/view/edit.html.php +++ b/module/project/view/edit.html.php @@ -167,7 +167,7 @@ model == 'kanban'):?> - + @@ -185,7 +185,7 @@ diff --git a/module/projectrelease/view/create.html.php b/module/projectrelease/view/create.html.php index 85aa85f6f3..961e59e5d7 100644 --- a/module/projectrelease/view/create.html.php +++ b/module/projectrelease/view/create.html.php @@ -65,7 +65,7 @@ diff --git a/module/projectrelease/view/edit.html.php b/module/projectrelease/view/edit.html.php index cdd1be55c7..d07a2a8617 100644 --- a/module/projectrelease/view/edit.html.php +++ b/module/projectrelease/view/edit.html.php @@ -22,7 +22,7 @@ -
custom->user->fields['contactField'];?>user->contactFieldList, $config->user->contactField, "class='form-control chosen' multiple");?>user->contactFieldList, $config->user->contactField, "class='form-control picker-select' multiple");?>
fetch('my', 'buildContactLists'); ?>
@@ -117,11 +117,11 @@ $("a[href^='###']").click(function()
doclib->group?> - +
doclib->user?> - +
doclib->group?> - +
doclib->user?> - +
mailto, "multiple class='form-control chosen'"); + echo html::select('mailto[]', $users, $doc->mailto, "multiple class='form-control picker-select'"); echo $this->fetch('my', 'buildContactLists'); ?>
@@ -93,11 +93,11 @@
doclib->group?> - groups, "class='form-control chosen' multiple")?> + groups, "class='form-control picker-select' multiple")?>
doclib->user?> - users, "class='form-control chosen' multiple")?> + users, "class='form-control picker-select' multiple")?>
doclib->group?> - groups, "class='form-control chosen' multiple")?> + groups, "class='form-control picker-select' multiple")?>
doclib->user?> - users, "class='form-control chosen' multiple")?> + users, "class='form-control picker-select' multiple")?>
execution->team;?>
execution->execDesc : $lang->execution->desc;?>whitelist;?>
- + fetch('my', 'buildContactLists', "dropdownName=whitelist");?>
execution->team;?>
execution->desc;?>whitelist;?>
- whitelist, 'class="form-control chosen" multiple');?> + whitelist, 'class="form-control picker-select" multiple');?> fetch('my', 'buildContactLists', "dropdownName=whitelist");?>
- acl['programs']) ? join(',', $group->acl['programs']) : '', "class='form-control chosen' multiple")?> + acl['programs']) ? join(',', $group->acl['programs']) : '', "class='form-control picker-select' multiple")?> group->noticeVisit?>
@@ -65,7 +65,7 @@
- acl['products']) ? join(',', $group->acl['products']) : '', "class='form-control chosen' multiple")?> + acl['products']) ? join(',', $group->acl['products']) : '', "class='form-control picker-select' multiple")?> group->noticeVisit?>
@@ -78,7 +78,7 @@
- acl['projects']) ? join(',', $group->acl['projects']) : '', "class='form-control chosen' drop_direction='down' multiple")?> + acl['projects']) ? join(',', $group->acl['projects']) : '', "class='form-control picker-select' data-dropDirection='bottom' multiple")?> group->noticeVisit?>
@@ -91,7 +91,7 @@
- acl['sprints']) ? join(',', $group->acl['sprints']) : '', "class='form-control chosen' drop_direction='down' multiple")?> + acl['sprints']) ? join(',', $group->acl['sprints']) : '', "class='form-control picker-select' data-dropDirection='bottom' multiple")?> group->noticeVisit?>
diff --git a/module/kanban/view/create.html.php b/module/kanban/view/create.html.php index 76ce6ae5be..624b95b5ac 100644 --- a/module/kanban/view/create.html.php +++ b/module/kanban/view/create.html.php @@ -42,7 +42,7 @@ 		kanban->team;?>
- +
whitelist;?>
kanbanspace->team;?>
- + fetch('my', 'buildContactLists');?>
whitelist;?>
diff --git a/module/kanban/view/edit.html.php b/module/kanban/view/edit.html.php index 706d49ef31..7fc39ab025 100644 --- a/module/kanban/view/edit.html.php +++ b/module/kanban/view/edit.html.php @@ -35,7 +35,7 @@ kanban->team;?>
- team, "class='form-control chosen' multiple data-drop_direction='down'");?> + team, "class='form-control picker-select' multiple data-dropDirection='bottom'");?>
whitelist;?>whitelist, 'class="form-control chosen" multiple');?>whitelist, 'class="form-control picker-select" multiple');?>
kanbanspace->team;?>
- + fetch('my', 'buildContactLists');?>
whitelist;?>whitelist, 'class="form-control chosen" multiple');?>whitelist, 'class="form-control picker-select" multiple');?>
diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php index 5f69f16da3..c577fa0f96 100644 --- a/module/product/view/edit.html.php +++ b/module/product/view/edit.html.php @@ -69,7 +69,7 @@
product->reviewer;?>reviewer, "class='form-control chosen' multiple");?>reviewer, "class='form-control picker-select' multiple");?>
product->type;?>whitelist;?>
- whitelist, 'class="form-control chosen" multiple');?> + whitelist, 'class="form-control picker-select" multiple');?> fetch('my', 'buildContactLists', "dropdownName=whitelist");?>
whitelist;?>
- + fetch('my', 'buildContactLists', "dropdownName=whitelist");?>
whitelist;?>
- whitelist, 'class="form-control chosen" multiple data-drop_direction="up"');?> + whitelist, 'class="form-control picker-select" multiple data-dropDirection="top"');?> fetch('my', 'buildContactLists', "dropdownName=whitelist");?>
execution->team;?>
whitelist;?>
- + fetch('my', 'buildContactLists', "dropdownName=whitelist");?>
execution->team;?>
whitelist;?>
- whitelist, 'class="form-control chosen" multiple');?> + whitelist, 'class="form-control picker-select" multiple');?> fetch('my', 'buildContactLists', "dropdownName=whitelist");?>
release->mailto;?>
- chooseUsersToMail}' multiple");?> + chooseUsersToMail}' multiple");?>
+
@@ -34,7 +34,7 @@ - + @@ -42,28 +42,28 @@ - + - + printExtendFields($release, 'table');?> - + - +
release->name;?>
release->build;?> build, "class='form-control chosen' required"); ?>
release->date;?> date, "class='form-control form-date' required");?>
release->status;?> release->statusList, $release->status, "class='form-control'");?>
release->desc;?> desc), "rows=10 class='form-control kindeditor' hidefocus='true'");?>
release->mailto;?>
- mailto, "class='form-control chosen' data-placeholder='{$lang->chooseUsersToMail}' multiple");?> + mailto, "class='form-control picker-select' data-placeholder='{$lang->chooseUsersToMail}' multiple");?>
files;?> fetch('file', 'buildform');?>
@@ -73,7 +73,7 @@
- + diff --git a/module/release/view/create.html.php b/module/release/view/create.html.php index fae48e175d..4573a4382e 100644 --- a/module/release/view/create.html.php +++ b/module/release/view/create.html.php @@ -55,7 +55,7 @@ release->mailto;?>
- chooseUsersToMail}' multiple");?> + chooseUsersToMail}' multiple");?>
diff --git a/module/release/view/edit.html.php b/module/release/view/edit.html.php index efc184ee44..5c1abb0d12 100644 --- a/module/release/view/edit.html.php +++ b/module/release/view/edit.html.php @@ -56,7 +56,7 @@ release->mailto;?>
- mailto, "class='form-control chosen' data-placeholder='{$lang->chooseUsersToMail}' multiple");?> + mailto, "class='form-control picker-select' data-placeholder='{$lang->chooseUsersToMail}' multiple");?>
diff --git a/module/repo/view/create.html.php b/module/repo/view/create.html.php index 3999ad4d98..46466bb566 100644 --- a/module/repo/view/create.html.php +++ b/module/repo/view/create.html.php @@ -84,11 +84,11 @@
repo->group?> - +
repo->user?> - +
diff --git a/module/repo/view/edit.html.php b/module/repo/view/edit.html.php index 2c7843b1d1..d7dfd84332 100644 --- a/module/repo/view/edit.html.php +++ b/module/repo/view/edit.html.php @@ -89,11 +89,11 @@
repo->group?> - acl->groups) ? '' : join(',', $repo->acl->groups), "class='form-control chosen' multiple")?> + acl->groups) ? '' : join(',', $repo->acl->groups), "class='form-control picker-select' multiple")?>
repo->user?> - acl->users) ? '' : join(',', $repo->acl->users), "class='form-control chosen' multiple")?> + acl->users) ? '' : join(',', $repo->acl->users), "class='form-control picker-select' multiple")?>
diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php index 94c57d80de..108a37739d 100755 --- a/module/story/view/batchcreate.html.php +++ b/module/story/view/batchcreate.html.php @@ -109,7 +109,7 @@ '> '>
- + story->ditto;?>
diff --git a/module/story/view/change.html.php b/module/story/view/change.html.php index b03c4550a1..79333c1e1e 100644 --- a/module/story/view/change.html.php +++ b/module/story/view/change.html.php @@ -26,7 +26,7 @@ story->reviewedBy;?>
- story->checkForceReview() ? ' required' : ''));?> + story->checkForceReview() ? ' required' : ''));?> story->checkForceReview()):?> story->needNotReview, '', "id='needNotReview' {$needReview}");?> diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php index 038ac846a2..65afdf1cae 100644 --- a/module/story/view/create.html.php +++ b/module/story/view/create.html.php @@ -107,7 +107,7 @@
story->checkForceReview()):?>
- PO : '', "class='form-control chosen' multiple");?> + PO : '', "class='form-control picker-select' multiple");?>
@@ -119,7 +119,7 @@
- PO : '', "class='form-control chosen' multiple required");?> + PO : '', "class='form-control picker-select' multiple required");?>
diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php index d024d2c274..9b0f5bc552 100644 --- a/module/story/view/edit.html.php +++ b/module/story/view/edit.html.php @@ -200,7 +200,7 @@ story->mailto;?>
- mailto), "class='form-control chosen' multiple");?> + mailto), "class='form-control picker-select' multiple");?> fetch('my', 'buildContactLists');?>
@@ -221,7 +221,7 @@ story->reviewers;?> - + status == 'closed'):?> diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index e53cafb64d..793691916c 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -176,7 +176,7 @@ task->mailto;?>
- mailto), 'class="form-control chosen" multiple');?> + mailto), 'class="form-control picker-select" multiple');?> fetch('my', 'buildContactLists');?>
diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php index 5e6987c276..15eacebfe5 100644 --- a/module/testcase/view/edit.html.php +++ b/module/testcase/view/edit.html.php @@ -215,7 +215,7 @@ testcase->stage;?> - testcase->stageList, $case->stage, "class='form-control chosen' multiple='multiple'");?> + testcase->stageList, $case->stage, "class='form-control picker-select' multiple='multiple'");?> testcase->pri;?> diff --git a/module/testreport/view/create.html.php b/module/testreport/view/create.html.php index feb1b2ddd7..9120f3b103 100644 --- a/module/testreport/view/create.html.php +++ b/module/testreport/view/create.html.php @@ -59,7 +59,7 @@ testreport->members?> - + diff --git a/module/testreport/view/edit.html.php b/module/testreport/view/edit.html.php index 0060819f2e..ec13e2c3a7 100644 --- a/module/testreport/view/edit.html.php +++ b/module/testreport/view/edit.html.php @@ -47,7 +47,7 @@ testreport->members?> - members, "class='form-control chosen' multiple")?> + members, "class='form-control picker-select' multiple")?> diff --git a/module/testtask/view/create.html.php b/module/testtask/view/create.html.php index 36a92833b3..b25cd1ef23 100644 --- a/module/testtask/view/create.html.php +++ b/module/testtask/view/create.html.php @@ -52,7 +52,7 @@ testtask->type;?> - testtask->typeList, '', "class='form-control chosen' multiple");?> + testtask->typeList, '', "class='form-control picker-select' multiple");?> testtask->owner;?> @@ -99,7 +99,7 @@
fetch('my', 'buildContactLists'); ?>
diff --git a/module/testtask/view/edit.html.php b/module/testtask/view/edit.html.php index bb8b50d399..65ea9ce769 100644 --- a/module/testtask/view/edit.html.php +++ b/module/testtask/view/edit.html.php @@ -41,7 +41,7 @@ testtask->type;?> - testtask->typeList, $task->type, "class='form-control chosen' multiple");?> + testtask->typeList, $task->type, "class='form-control picker-select' multiple");?> testtask->owner;?> @@ -91,7 +91,7 @@ testtask->mailto;?>
- mailto), "multiple class='form-control chosen'");?> + mailto), "multiple class='form-control picker-select'");?> fetch('my', 'buildContactLists');?>
diff --git a/module/user/control.php b/module/user/control.php index b99d0588fc..53d0bab652 100755 --- a/module/user/control.php +++ b/module/user/control.php @@ -1199,7 +1199,7 @@ class user extends control if(isset($this->config->user->moreLink)) $this->config->moreLinks[$dropdownName . "[]"] = $this->config->user->moreLink; $defaultUsers = empty($contactListID) ? '' : $list->userList . ',' . trim($oldUsers); - return print(html::select($dropdownName . "[]", $users, $defaultUsers, "class='form-control chosen' multiple $attr")); + return print(html::select($dropdownName . "[]", $users, $defaultUsers, "class='form-control picker-select' multiple $attr")); } /**