Merge branch 'fixConflict_24687' into 'master'

fixConflict_24687

See merge request easycorp/zentaopms!4512

module/project/js/edit.js

@@ -146,6 +146,17 @@ $(function()
     });
 
     $(document).on('change', "select[id^='branch']", disableSelectedBranch);
+
+    if(requiredFields.indexOf('budget') >= 0 && budget == 0)
+    {
+        $('#budget').removeAttr('disabled');
+        $('td .checkbox-primary').addClass('hidden');
+    }
+    if(requiredFields.indexOf('budget') >= 0 && budget != 0)
+    {
+        $('td .checkbox-primary').addClass('hidden');
+    }
+
 });
 
 /**

module/project/view/create.html.php

@@ -27,6 +27,7 @@
 <?php js::set('productName', $lang->product->name);?>
 <?php js::set('manageProducts', $lang->project->manageProducts);?>
 <?php $requiredFields = $config->project->create->requiredFields;?>
+<?php js::set('requiredFields', $requiredFields);?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>
@@ -77,7 +78,7 @@
             </div>
           </td>
           <td>
-            <div class='checkbox-primary c-future'>
+            <div class="checkbox-primary c-future <?php echo strpos($requiredFields, 'budget') !== false ? 'hidden' : '';?>">
               <input type='checkbox' id='future' name='future' value='1' />
               <label for='future'><?php echo $lang->project->future;?></label>
             </div>

module/project/view/edit.html.php

@@ -28,6 +28,8 @@
 <?php js::set('multiBranchProducts', $multiBranchProducts);?>
 <?php $aclList = $project->parent ? $lang->project->subAclList : $lang->project->aclList;?>
 <?php $requiredFields = $config->project->edit->requiredFields;?>
+<?php js::set('requiredFields', $requiredFields);?>
+<?php js::set('budget', $project->budget);?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>