From 346173b831df7a8e59dece4447e33fe3f913af70 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Tue, 31 Aug 2021 11:12:38 +0800
Subject: [PATCH] * Fix bug #14795.

---
 module/execution/css/create.css       | 1 +
 module/execution/js/create.js         | 6 +++++-
 module/execution/model.php            | 1 +
 module/execution/view/create.html.php | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/module/execution/css/create.css b/module/execution/css/create.css
index 7cd4be44f3..d482356317 100644
--- a/module/execution/css/create.css
+++ b/module/execution/css/create.css
@@ -14,3 +14,4 @@
 .checkbox input[type=checkbox], .checkbox-inline input[type=checkbox], .radio input[type=radio], .radio-inline input[type=radio] {margin-top: 1px;}
 
 #lifeTimeTips {display: none;}
+#teams_chosen ul .label {margin-top: 3px;}
diff --git a/module/execution/js/create.js b/module/execution/js/create.js
index a859b26f23..fd90c0791f 100644
--- a/module/execution/js/create.js
+++ b/module/execution/js/create.js
@@ -46,7 +46,11 @@ $(function()
 
     $('#teams_chosen').click(function()
     {
-        if(systemMode == 'new') $('#teams_chosen ul li:first').after(' <label class="label">' + projectCommon + '</label>');
+        if(systemMode == 'new')
+        {
+            $('#teams_chosen ul .label').remove();
+            $('#teams_chosen ul li:first').after(' <label class="label">' + projectCommon + '</label>');
+        }
     })
 
     $('#teams').change(function()
diff --git a/module/execution/model.php b/module/execution/model.php
index 10416cdcf5..7049560e01 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -2461,6 +2461,7 @@ class executionModel extends model
             ->andWhere('(project')->eq($projectID)
             ->orWhere('id')->eq($projectID)
             ->markRight(1)
+            ->orderBy('project_asc')
             ->fetchAll('id');
 
         if(empty($teams)) return array();
diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index 00b71a9267..54510c4bd4 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -38,7 +38,7 @@
 <?php js::set('isStage', false);?>
 <?php js::set('copyExecutionID', $copyExecutionID);?>
 <?php js::set('systemMode', $config->systemMode);?>
-<?php js::set('projectCommon', $lang->projectCommon);?>
+<?php js::set('projectCommon', $lang->project->common);?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>