diff --git a/module/productplan/js/batchedit.js b/module/productplan/js/batchedit.js index 0d78be81a5..31118f219a 100644 --- a/module/productplan/js/batchedit.js +++ b/module/productplan/js/batchedit.js @@ -7,7 +7,7 @@ */ function changeDate(planID) { - if($("#future"+planID).prop('checked')) + if($("#future" + planID).prop('checked')) { $("input[name='begin[" + planID + "]']").attr('disabled', 'disabled').val(''); $("input[name='end[" + planID + "]']").attr('disabled', 'disabled').val(''); diff --git a/module/productplan/view/batchedit.html.php b/module/productplan/view/batchedit.html.php index c39b3cdedd..5d87b86442 100644 --- a/module/productplan/view/batchedit.html.php +++ b/module/productplan/view/batchedit.html.php @@ -38,7 +38,7 @@
- begin == $this->config->productplan->future and $plan->end == $this->config->productplan->future) ? 'checked="checked"' : '';?> + begin == $config->productplan->future and $plan->end == $config->productplan->future) ? 'checked="checked"' : '';?>| productplan->begin;?> | -begin != $this->config->productplan->future ? formatTime($plan->begin) : '', "class='form-control form-date'");?> | +begin != $config->productplan->future ? formatTime($plan->begin) : '', "class='form-control form-date'");?> | ||
|---|---|---|---|---|
| productplan->end;?> | -end != $this->config->productplan->future ? formatTime($plan->end) : '', 'class="form-control form-date"');?> | +end != $config->productplan->future ? formatTime($plan->end) : '', 'class="form-control form-date"');?> | ||
| productplan->desc;?> | diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php index 544398bc2f..e842979fa6 100644 --- a/module/productplan/view/view.html.php +++ b/module/productplan/view/view.html.php @@ -29,7 +29,7 @@ title;?> type !== 'normal') echo "" . $branchOption[$branch] . '';?> - begin == $this->config->productplan->future || $plan->end == $this->config->productplan->future) ? $lang->productplan->future : $plan->begin . '~' . $plan->end;?> + begin == $config->productplan->future || $plan->end == $config->productplan->future) ? $lang->productplan->future : $plan->begin . '~' . $plan->end;?> deleted):?> product->deleted;?> @@ -47,7 +47,7 @@ $attr = "target='hiddenwin'"; $isOnlyBody = false; $class = ''; - if($plan->begin == $this->config->productplan->future or $plan->end == $this->config->productplan->future) + if($plan->begin == $config->productplan->future or $plan->end == $config->productplan->future) { $class = 'iframe'; $attr = "data-toggle='modal' data-id='{$plan->id}' data-width='550px'"; @@ -596,11 +596,11 @@||||
| productplan->begin;?> | -begin == $this->config->productplan->future ? $lang->productplan->future : $plan->begin;?> | +begin == $config->productplan->future ? $lang->productplan->future : $plan->begin;?> | ||
| productplan->end;?> | -end == $this->config->productplan->future ? $lang->productplan->future : $plan->end;?> | +end == $config->productplan->future ? $lang->productplan->future : $plan->end;?> | ||