diff --git a/module/product/config.php b/module/product/config.php index a806d1d8dd..7ca68f270a 100644 --- a/module/product/config.php +++ b/module/product/config.php @@ -2,6 +2,11 @@ $config->product = new stdclass(); $config->product->orderBy = 'isClosed,order_desc'; +$config->product->customBatchEditFields = 'PO,QD,RD,status,type,desc'; + +$config->product->custom = new stdclass(); +$config->product->custom->batchedit = 'PO,QD,RD,status'; + global $lang, $app; $app->loadLang('story'); $config->product->search['module'] = 'story'; diff --git a/module/product/control.php b/module/product/control.php index 454e3363cd..e5e3025aa0 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -266,6 +266,11 @@ class product extends control $productIDList = $this->post->productIDList ? $this->post->productIDList : die(js::locate($this->session->productList, 'parent')); + /* Set custom. */ + foreach(explode(',', $this->config->product->customBatchEditFields) as $field) $customFields[$field] = $this->lang->product->$field; + $this->view->customFields = $customFields; + $this->view->showFields = $this->config->product->custom->batchedit; + $this->view->title = $this->lang->product->batchEdit; $this->view->position[] = $this->lang->product->batchEdit; $this->view->productIDList = $productIDList; diff --git a/module/product/model.php b/module/product/model.php index a1ea17b879..1b1ee0714f 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -301,7 +301,9 @@ class productModel extends model $products[$productID]->PO = $this->post->POs[$productID]; $products[$productID]->QD = $this->post->QDs[$productID]; $products[$productID]->RD = $this->post->RDs[$productID]; + $products[$productID]->type = $this->post->types[$productID]; $products[$productID]->status = $this->post->statuses[$productID]; + $products[$productID]->desc = $this->post->descs[$productID]; $products[$productID]->order = $this->post->orders[$productID]; } diff --git a/module/product/view/batchedit.html.php b/module/product/view/batchedit.html.php index 6ec0016966..cf2ac534b6 100755 --- a/module/product/view/batchedit.html.php +++ b/module/product/view/batchedit.html.php @@ -14,19 +14,31 @@
icons['product']);?> icons['batchEdit']);?> product->batchEdit;?> +
+ +
+
'> - + - - - - + + + + + + @@ -35,14 +47,18 @@ - - - - + + + + + + - +
idAB;?> product->name;?> product->name;?> product->code;?> product->PO;?>product->QD;?>product->RD;?>product->status;?>'>product->PO;?>'>product->QD;?>'>product->RD;?>'>product->type;?>'>product->status;?>'>product->desc;?> product->order;?>
name, "class='form-control'");?> code, "class='form-control'");?>PO, "class='form-control chosen'");?>QD, "class='form-control chosen'");?>RD, "class='form-control chosen'");?>product->statusList, $products[$productID]->status, "class='form-control'");?>' style='overflow:visible'>PO, "class='form-control chosen'");?>' style='overflow:visible'>QD, "class='form-control chosen'");?>' style='overflow:visible'>RD, "class='form-control chosen'");?>'>product->typeList, $products[$productID]->type, "class='form-control'");?>'>product->statusList, $products[$productID]->status, "class='form-control'");?>'>desc), "rows='1' class='form-control autosize'");?> order, "class='form-control'");?>
+createLink('custom', 'ajaxSaveCustom', 'module=product§ion=custom&key=batchedit')?> + diff --git a/module/project/config.php b/module/project/config.php index f5db59ce6f..051be49900 100644 --- a/module/project/config.php +++ b/module/project/config.php @@ -11,7 +11,7 @@ $config->project->edit = new stdclass(); $config->project->create->requiredFields = 'name,code,begin,end'; $config->project->edit->requiredFields = 'name,code,begin,end'; -$config->project->customBatchEditFields = 'days,type,teamname,status,PO,QD,PM,RD'; +$config->project->customBatchEditFields = 'days,type,teamname,status,desc,PO,QD,PM,RD'; $config->project->custom = new stdclass(); $config->project->custom->batchedit = 'days,status,PM'; diff --git a/module/project/model.php b/module/project/model.php index 134637f7ac..ad97e5084b 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -351,6 +351,7 @@ class projectModel extends model $projects[$projectID]->begin = $this->post->begins[$projectID]; $projects[$projectID]->end = $this->post->ends[$projectID]; $projects[$projectID]->team = $this->post->teams[$projectID]; + $projects[$projectID]->desc = $this->post->descs[$projectID]; $projects[$projectID]->days = $this->post->dayses[$projectID]; $projects[$projectID]->order = $this->post->orders[$projectID]; } diff --git a/module/project/view/batchedit.html.php b/module/project/view/batchedit.html.php index ffc747cb30..e89deeaafc 100755 --- a/module/project/view/batchedit.html.php +++ b/module/project/view/batchedit.html.php @@ -43,6 +43,7 @@ $minWidth = (count($hasFields) > 5) ? 'w-150px' : ''; '>project->status;?> project->begin;?> project->end;?> + '> project->desc;?> '>project->teamname;?> '>project->days;?> project->order;?> @@ -61,6 +62,7 @@ $minWidth = (count($hasFields) > 5) ? 'w-150px' : ''; '>project->statusList, $projects[$projectID]->status, 'class=form-control');?> begin, "class='form-control form-date' onchange='computeWorkDays(this.id)'");?> end, "class='form-control form-date' onchange='computeWorkDays(this.id)'");?> + '> desc), "rows='1' class='form-control autosize'");?> '>team, "class='form-control'");?> '>