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"' : '';?> id . html::hidden("id[$plan->id]", $plan->id);?> type != 'normal'):?> @@ -53,10 +53,10 @@ id]", array_slice($lang->productplan->statusList,($plan->status == 'wait' ? 0 : 1)), $plan->status, "class='form-control chosen' disabled onchange='setPlanStatus($plan->id, this.value, $plan->parent)'");?> - begin == '2030-01-01' or $plan->end == '2030-01-01') and $plan->status == 'wait') ? 'disabled="disabled"' : '';?> - parent == -1 and ($plan->begin == '2030-01-01' or $plan->end == '2030-01-01')) $disabled = 'disabled="disabled"';?> - begin == '2030-01-01') $plan->begin = '';?> - end == '2030-01-01') $plan->end = '';?> + begin == $this->config->productplan->future and $plan->end == $this->config->productplan->future) and $plan->status == 'wait') ? 'disabled="disabled"' : '';?> + parent == -1 and ($plan->begin == $this->config->productplan->future or $plan->end == $this->config->productplan->future)) $disabled = 'disabled="disabled"';?> + begin == $this->config->productplan->future) $plan->begin = '';?> + end == $this->config->productplan->future) $plan->end = '';?> id]", $plan->begin, "class='form-control form-date' $disabled");?> id]", $plan->end, "class='form-control form-date' $disabled");?> status != 'wait' and $plan->parent != -1) ? 'hidden' : '';?> diff --git a/module/productplan/view/browsebylist.html.php b/module/productplan/view/browsebylist.html.php index e5566c63bd..026891af4b 100644 --- a/module/productplan/view/browsebylist.html.php +++ b/module/productplan/view/browsebylist.html.php @@ -134,8 +134,8 @@ session->currentProductType != 'normal'):?> parent != '-1') echo $branchOption[$plan->branch];?> - begin == '2030-01-01' ? $lang->productplan->future : $plan->begin;?> - end == '2030-01-01' ? $lang->productplan->future : $plan->end;?> + begin == $this->config->productplan->future ? $lang->productplan->future : $plan->begin;?> + end == $this->config->productplan->future ? $lang->productplan->future : $plan->end;?> stories;?> bugs;?> hour;?> @@ -152,7 +152,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-id='{$plan->id}' data-width='70%'"; diff --git a/module/productplan/view/edit.html.php b/module/productplan/view/edit.html.php index 580878bf26..049323c8cf 100644 --- a/module/productplan/view/edit.html.php +++ b/module/productplan/view/edit.html.php @@ -48,9 +48,9 @@ status != 'wait' ? 'hidden' : '';?> - begin == '2030-01-01' || $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'");?> status == 'wait'):?>
@@ -62,8 +62,8 @@ productplan->end;?> - end != '2030-01-01' ? formatTime($plan->end) : '', "class='form-control form-date'");?> - end == '2030-01-01' ? 0 : (strtotime($plan->end) - strtotime($plan->begin)) / 3600 / 24 + 1;?> + end != $this->config->productplan->future ? formatTime($plan->end) : '', "class='form-control form-date'");?> + end == $this->config->productplan->future ? 0 : (strtotime($plan->end) - strtotime($plan->begin)) / 3600 / 24 + 1;?> productplan->endList , $deltaValue, "onclick='computeEndDate(this.value)'");?> printExtendFields($plan, 'table', 'columns=3');?> diff --git a/module/productplan/view/start.html.php b/module/productplan/view/start.html.php index 5087c5207d..bd8b01204e 100644 --- a/module/productplan/view/start.html.php +++ b/module/productplan/view/start.html.php @@ -21,11 +21,11 @@ - + - + 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 @@ - + - + parent == '-1'):?>
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;?>
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;?>