diff --git a/module/productplan/control.php b/module/productplan/control.php index 4924845a24..1774a804f4 100644 --- a/module/productplan/control.php +++ b/module/productplan/control.php @@ -161,7 +161,7 @@ class productplan extends control } $this->loadModel('score')->create('ajax', 'batchOther'); - die(js::locate(inlink('browse', "productID=$productID&branch=$branch"), 'parent')); + die(js::locate($this->session->productPlanList, 'parent')); } $planIDList = $this->post->planIDList ? $this->post->planIDList : die(js::locate($this->session->productPlanList, 'parent')); diff --git a/module/productplan/js/batchedit.js b/module/productplan/js/batchedit.js index 5b8cf09d81..0d78be81a5 100644 --- a/module/productplan/js/batchedit.js +++ b/module/productplan/js/batchedit.js @@ -9,8 +9,8 @@ function changeDate(planID) { if($("#future"+planID).prop('checked')) { - $("input[name='begin[" + planID + "]']").attr('disabled', 'disabled'); - $("input[name='end[" + planID + "]']").attr('disabled', 'disabled'); + $("input[name='begin[" + planID + "]']").attr('disabled', 'disabled').val(''); + $("input[name='end[" + planID + "]']").attr('disabled', 'disabled').val(''); } else { diff --git a/module/productplan/js/edit.js b/module/productplan/js/edit.js index 8aa184ecee..5f23f3e678 100644 --- a/module/productplan/js/edit.js +++ b/module/productplan/js/edit.js @@ -92,7 +92,7 @@ $('#future').on('change', function() { if($(this).prop('checked')) { - $('#begin').attr('disabled', 'disabled'); + $('#begin').attr('disabled', 'disabled').val(''); $('#end').parents('tr').hide(); } else diff --git a/module/productplan/view/batchedit.html.php b/module/productplan/view/batchedit.html.php index eab73ee039..c39b3cdedd 100644 --- a/module/productplan/view/batchedit.html.php +++ b/module/productplan/view/batchedit.html.php @@ -38,7 +38,7 @@
- begin == '2030-01-01' or $plan->end == '2030-01-01') ? 'checked="checked"' : '';?> + begin == $this->config->productplan->future and $plan->end == $this->config->productplan->future) ? 'checked="checked"' : '';?>| productplan->begin;?> | -begin != '2030-01-01' ? formatTime($plan->begin) : '', "class='form-control form-date'");?> | +begin != $this->config->productplan->future ? formatTime($plan->begin) : '', "class='form-control form-date'");?> | ||
|---|---|---|---|---|
| productplan->end;?> | -end != '2030-01-01' ? formatTime($plan->end) : '', 'class="form-control form-date"');?> | +end != $this->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 b22ff1090e..544398bc2f 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 == '2030-01-01' || $plan->end == '2030-01-01') ? $lang->productplan->future : $plan->begin . '~' . $plan->end;?> + begin == $this->config->productplan->future || $plan->end == $this->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 == '2030-01-01' or $plan->end == '2030-01-01') + if($plan->begin == $this->config->productplan->future or $plan->end == $this->config->productplan->future) { $class = 'iframe'; $attr = "data-toggle='modal' data-id='{$plan->id}' data-width='550px'"; @@ -596,11 +596,11 @@||||
| productplan->begin;?> | -begin == '2030-01-01' ? $lang->productplan->future : $plan->begin;?> | +begin == $this->config->productplan->future ? $lang->productplan->future : $plan->begin;?> | ||
| productplan->end;?> | -end == '2030-01-01' ? $lang->productplan->future : $plan->end;?> | +end == $this->config->productplan->future ? $lang->productplan->future : $plan->end;?> | ||