Merge branch 'master' of github.com:easysoft/zentaopms

module/bug/js/common.js

@@ -352,9 +352,6 @@ function loadProjectBuilds(projectID)
     {
         link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + productID + '&varName=openedBuild&build=' + oldOpenedBuild + '&branch=' + branch);
         $('#openedBuildBox').load(link, function(){$(this).find('select').chosen()});
-
-        link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + productID + '&varName=resolvedBuild&build=' + oldResolvedBuild + '&branch=' + branch);
-        $('#resolvedBuildBox').load(link, function(){$(this).find('select').chosen()});
     }
 }
 

module/bug/view/batchcreate.html.php

@@ -48,7 +48,7 @@
           <tr>
             <th class='w-50px'><?php echo $lang->idAB;?></th> 
             <th class='w-120px<?php echo zget($visibleFields, $product->type, ' hidden')?>'> <?php echo $lang->product->branch;?></th>
-            <th class='w-120px required'> <?php echo $lang->bug->module;?></th>
+            <th class='w-120px'> <?php echo $lang->bug->module;?></th>
             <th class='w-130px<?php echo zget($visibleFields, 'project', ' hidden') . zget($requiredFields, 'project', '', ' required');?>'><?php echo $lang->bug->project;?></th>
             <th class='w-100px required'><?php echo $lang->bug->openedBuild;?></th>
             <th class='c-title required'><?php echo $lang->bug->title;?></th>

module/productplan/js/create.js

@@ -50,14 +50,6 @@ $('#end').on('change', function()
     $("input:radio[name='delta']").attr("checked", false);
 });
 
-$('form').submit(function()
-{
-    $('#submit').click(function()
-    {
-        return false;
-    });   
-})
-
 $('#future').on('change', function()
 {
     if($(this).prop('checked'))

module/story/view/create.html.php

@@ -41,7 +41,7 @@
               <div class='input-group' id='moduleIdBox'>
                 <div class="input-group-addon"><?php echo $lang->story->module;?></div>
                 <?php
-                echo html::select('module', $moduleOptionMenu, $moduleID, "class='form-control chosen' required");
+                echo html::select('module', $moduleOptionMenu, $moduleID, "class='form-control chosen'");
                 if(count($moduleOptionMenu) == 1)
                 {
                     echo "<div class='input-group-addon'>";