Merge branch 'cyy_bug' into 'master'

* Fix bug #28114.

See merge request easycorp/zentaopms!7159

module/api/js/create.js

@@ -41,7 +41,6 @@ var app = new Vue({
     },
     methods: {
         changeAttr(val) {
-            // console.log('更新之前', JSON.stringify(val))
             this.body = val;
         },
         changeType(val) {

module/api/js/edit.js

@@ -58,7 +58,6 @@ var app = new Vue({
     },
     methods: {
         changeAttr(val) {
-            // console.log('新的值', JSON.stringify(val))
             this.body = val
         },
         changeType(val) {

module/build/view/view.html.php

@@ -74,7 +74,7 @@ tbody tr td:first-child input {display: none;}
         <div class='actions'><?php echo html::a("javascript:showLink($build->id, \"story\")", '<i class="icon-link"></i> ' . $lang->build->linkStory, '', "class='btn btn-primary'");?></div>
         <div class='linkBox cell hidden'></div>
         <?php endif;?>
-        <form class='main-table table-story' data-ride='table' method='post' target='hiddenwin' action='<?php echo $this->createLink($module, 'batchUnlinkStory', "buildID={$build->id}")?>' id='linkedStoriesForm'>
+        <form class='main-table table-story<?php if($link === 'true' and $type == 'story') echo " hidden";?>' data-ride='table' method='post' target='hiddenwin' action='<?php echo $this->createLink($module, 'batchUnlinkStory', "buildID={$build->id}")?>' id='linkedStoriesForm'>
           <table class='table has-sort-head' id='storyList'>
             <?php $canBatchUnlink = ($canBeChanged and common::hasPriv($module, 'batchUnlinkStory'));?>
             <?php $vars = "buildID={$build->id}&type=story&link=$link&param=$param&orderBy=%s";?>
@@ -192,7 +192,7 @@ tbody tr td:first-child input {display: none;}
         <div class='actions'><?php echo html::a("javascript:showLink($build->id, \"bug\")", '<i class="icon-bug"></i> ' . $lang->build->linkBug, '', "class='btn btn-primary'");?></div>
         <div class='linkBox cell hidden'></div>
         <?php endif;?>
-        <form class='main-table table-bug' data-ride='table' method='post' target='hiddenwin' action="<?php echo $this->createLink($module, 'batchUnlinkBug', "build=$build->id");?>" id='linkedBugsForm'>
+        <form class='main-table table-bug<?php if($link === 'true' and $type == 'bug') echo " hidden";?>' data-ride='table' method='post' target='hiddenwin' action="<?php echo $this->createLink($module, 'batchUnlinkBug', "build=$build->id");?>" id='linkedBugsForm'>
           <table class='table has-sort-head' id='bugList'>
             <?php $canBatchUnlink = $canBeChanged and common::hasPriv($module, 'batchUnlinkBug');?>
             <?php $vars = "buildID={$build->id}&type=bug&link=$link&param=$param&orderBy=%s";?>

module/product/control.php

@@ -1096,7 +1096,7 @@ class product extends control
         if(empty($productID) or $programID) $lines = $this->product->getLinePairs($programID);
 
         if($productID)  return print(html::select("lines[$productID]", array('' => '') + $lines, '', "class='form-control picker-select'"));
-        if(!$productID) return print(html::select('line', array('' => '') + $lines, '', "class='form-control chosen'"));
+        if(!$productID) return print(html::select('line', array('' => '') + $lines, '', "class='form-control picker-select'"));
     }
 
     /**

module/product/js/create.js

@@ -40,9 +40,9 @@ $('#program').change(function()
 
     $.get(createLink('product', 'ajaxGetLine', 'programID=' + programID), function(data)
     {
-        $('#line_chosen').remove();
         $('#line').replaceWith(data);
-        $('#line').chosen();
+        $('#line').siblings('.picker').remove();
+        $('#line').picker();
     })
 })
 

module/product/js/edit.js

@@ -10,8 +10,8 @@ $('#program').change(function()
 
     $.get(createLink('product', 'ajaxGetLine', 'programID=' + programID), function(data)
     {
-        $('#line_chosen').remove();
         $('#line').replaceWith(data);
-        $('#line').chosen();
+        $('#line').siblings('.picker').remove();
+        $('#line').picker();
     })
 });

module/product/view/edit.html.php

@@ -40,7 +40,7 @@
           </tr>
           <tr>
             <th class='w-140px'><?php echo $lang->product->line;?></th>
-            <td><?php echo html::select('line', $lines, $product->line, "class='form-control chosen'");?></td><td></td>
+            <td><?php echo html::select('line', $lines, $product->line, "class='form-control picker-select'");?></td><td></td>
           </tr>
           <?php endif;?>
           <tr>

module/productplan/view/view.html.php

@@ -102,7 +102,7 @@
         <?php if(common::hasPriv('productplan', 'linkStory')):?>
         <div class='linkBox cell hidden'></div>
         <?php endif;?>
-        <form class='main-table table-story' data-ride="" method='post' target='hiddenwin' action="<?php echo inlink('batchUnlinkStory', "planID=$plan->id&orderBy=$orderBy");?>">
+        <form class='main-table table-story<?php if($link === 'true' and $type == 'story') echo " hidden";?>' data-ride="" method='post' target='hiddenwin' action="<?php echo inlink('batchUnlinkStory', "planID=$plan->id&orderBy=$orderBy");?>">
           <table class='table has-sort-head' id='storyList'>
             <?php
             $canBatchUnlink       = common::hasPriv('productPlan', 'batchUnlinkStory');
@@ -402,7 +402,7 @@
         </div>
         <div class='linkBox cell hidden'></div>
         <?php endif;?>
-        <form class='main-table table-bug' data-ride='table' method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkBug', "planID=$plan->id&orderBy=$orderBy");?>">
+        <form class='main-table table-bug<?php if($link === 'true' and $type == 'bug') echo " hidden";?>' data-ride='table' method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkBug', "planID=$plan->id&orderBy=$orderBy");?>">
           <table class='table has-sort-head' id='bugList'>
             <?php
             $canBatchUnlink     = common::hasPriv('productplan', 'batchUnlinkBug');

module/release/view/view.html.php

@@ -54,7 +54,7 @@
             <div class='actions'><?php echo html::a("javascript:showLink({$release->id}, \"story\")", '<i class="icon-link"></i> ' . $lang->release->linkStory, '', "class='btn btn-primary'");?></div>
             <div class='linkBox cell hidden'></div>
             <?php endif;?>
-            <form class='main-table table-story' method='post' id='linkedStoriesForm' data-ride="table">
+            <form class='main-table table-story<?php if($link === 'true' and $type == 'story') echo " hidden";?>' method='post' id='linkedStoriesForm' data-ride="table">
               <table class='table has-sort-head' id='storyList'>
                 <?php
                 $canBatchUnlink = common::hasPriv('release', 'batchUnlinkStory');
@@ -154,7 +154,7 @@
             <div class='actions'><?php echo html::a("javascript:showLink({$release->id}, \"bug\")", '<i class="icon-bug"></i> ' . $lang->release->linkBug, '', "class='btn btn-primary'");?></div>
             <div class='linkBox cell hidden'></div>
             <?php endif;?>
-            <form class='main-table table-bug' method='post' target='hiddenwin' id='linkedBugsForm' data-ride="table">
+            <form class='main-table table-bug<?php if($link === 'true' and $type == 'bug') echo " hidden";?>' method='post' target='hiddenwin' id='linkedBugsForm' data-ride="table">
               <table class='table has-sort-head' id='bugList'>
                 <?php $canBatchUnlink = common::hasPriv('release', 'batchUnlinkBug');?>
                 <?php $canBatchClose  = common::hasPriv('bug', 'batchClose');?>
@@ -247,7 +247,7 @@
             <div class='actions'><?php echo html::a("javascript:showLink({$release->id}, \"leftBug\")", '<i class="icon-bug"></i> ' . $lang->release->linkBug, '', "class='btn btn-primary'");?></div>
             <div class='linkBox cell hidden'></div>
             <?php endif;?>
-            <form class='main-table table-bug' method='post' target='hiddenwin' action="<?php echo inlink('batchUnlinkBug', "releaseID=$release->id&type=leftBug");?>" id='linkedBugsForm' data-ride="table">
+            <form class='main-table table-bug<?php if($link === 'true' and $type == 'leftBug') echo " hidden";?>' method='post' target='hiddenwin' action="<?php echo inlink('batchUnlinkBug', "releaseID=$release->id&type=leftBug");?>" id='linkedBugsForm' data-ride="table">
               <table class='table has-sort-head' id='leftBugList'>
                 <?php $canBatchUnlink = common::hasPriv('release', 'batchUnlinkBug');?>
                 <?php $vars = "releaseID={$release->id}&type=leftBug&link=$link&param=$param&orderBy=%s";?>

module/story/js/common.js

@@ -38,7 +38,6 @@ $(function()
             {
                 setTimeout(function()
                 {
-                    console.log(11);
                     $saveButton.attr('type', 'button').removeAttr('disabled');
                     $saveDraftButton.removeAttr('disabled');
                 }, 10000);

module/zanode/js/common.js

@@ -26,7 +26,6 @@ $(function()
         $.get(link, function(data)
         {
             data = JSON.parse(data);
-            console.log(data);
             $('#osName').val(data.osName);
             if(data.memory != 0)
             {