Merge branch 'liyuchun_fixbug' into 'master'

Liyuchun fixbug

See merge request easycorp/zentaopms!4570

module/bug/js/view.js

@@ -45,12 +45,12 @@ $('#toTaskButton').on('click', function()
         var link = createLink('task', 'create', 'executionID=' + executionID + '&storyID=0&moduleID=0&taskID=0&todoID=0&extra=projectID=0&bugID=' + bugID);
         window.parent.$.apps.open(link, 'execution');
     }
-    else if(executionID == 0)
-    {
-        alert(errorNoExecution);
-    }
-    else
+    else if(projectID == 0)
     {
         alert(errorNoProject);
     }
+    else
+    {
+        alert(errorNoExecution);
+    }
 });

module/repo/view/ajaxgetdropmenu.html.php

@@ -38,7 +38,6 @@ li > a.selected {color: #3123ae !important; background: #f2eafc !important; line
           <i class='list-toggle icon'></i>
           <div class='label-type'>
             <a class='text-muted not-list-item'><?php echo $groupName;?></a>
-            <span class='label label-outline'><?php echo $this->lang->repo->type;?></span>
           </div>
           <ul data-idx='<?php echo $groupName;?>'>
           <?php foreach($group as $id => $repoName):?>