dept->manage);?>
diff --git a/module/custom/config.php b/module/custom/config.php
index 52f94670e7..66f30bfb46 100644
--- a/module/custom/config.php
+++ b/module/custom/config.php
@@ -30,7 +30,7 @@ $config->custom->requiredModules[85] = 'user';
$config->custom->fieldList['product']['create'] = 'name,code,line,PO,QD,RD,type,desc';
$config->custom->fieldList['product']['edit'] = 'name,code,line,PO,QD,RD,type,desc,status';
-$config->custom->fieldList['story']['create'] = 'product,plan,source,sourceNote,title,pri,estimate,mailto,keywords,spec,verify';
+$config->custom->fieldList['story']['create'] = 'module,plan,source,title,pri,estimate,keywords,spec,verify';
$config->custom->fieldList['story']['change'] = 'title,spec,verify,comment';
$config->custom->fieldList['story']['close'] = 'closedReason,comment';
$config->custom->fieldList['story']['review'] = 'reviewedDate,assignedTo,reviewedBy,comment';
@@ -38,16 +38,16 @@ $config->custom->fieldList['productplan'] = 'title,begin,end,desc';
$config->custom->fieldList['release'] = 'name,build,date,desc';
$config->custom->fieldList['project']['create'] = 'name,code,begin,end,days,type,desc';
$config->custom->fieldList['project']['edit'] = 'name,code,begin,end,days,type,desc,PO,PM,QD,RD';
-$config->custom->fieldList['task']['create'] = 'type,story,name,pri,estimate,desc,estStarted,deadline,mailto';
-$config->custom->fieldList['task']['edit'] = 'type,assignedTo,story,name,pri,estimate,desc,estStarted,deadline,mailto';
+$config->custom->fieldList['task']['create'] = 'type,story,name,pri,estimate,desc,estStarted,deadline';
+$config->custom->fieldList['task']['edit'] = 'type,name,pri,estimate,estStarted,deadline';
$config->custom->fieldList['task']['finish'] = 'consumed,finishedDate,comment';
$config->custom->fieldList['task']['activate'] = 'assignedTo,left,comment';
$config->custom->fieldList['build'] = 'product,name,builder,date,scmPath,filePath,desc';
-$config->custom->fieldList['bug']['create'] = 'product,project,openedBuild,assignedTo,deadline,type,os,browser,title,severity,pri,steps,story,task,mailto,keywords';
-$config->custom->fieldList['bug']['edit'] = 'product,plan,project,openedBuild,assignedTo,deadline,type,os,browser,title,severity,pri,steps,story,task,mailto,keywords';
+$config->custom->fieldList['bug']['create'] = 'module,project,openedBuild,deadline,type,os,browser,title,severity,pri,steps,keywords';
+$config->custom->fieldList['bug']['edit'] = 'productplan,openedBuild,assignedTo,deadline,type,os,browser,title,severity,pri,steps,keywords';
$config->custom->fieldList['bug']['resolve'] = 'resolution,resolvedBuild,resolvedDate,assignedTo,comment';
-$config->custom->fieldList['testcase']['create'] = 'product,type,stage,story,title,pri,precondition,keywords';
-$config->custom->fieldList['testcase']['edit'] = 'product,type,stage,story,title,pri,precondition,keywords,status';
+$config->custom->fieldList['testcase']['create'] = 'type,stage,story,title,pri,precondition,keywords';
+$config->custom->fieldList['testcase']['edit'] = 'type,stage,story,title,pri,precondition,keywords,status';
$config->custom->fieldList['testsuite'] = 'name,desc';
$config->custom->fieldList['testcase']['createcase'] = 'lib,type,stage,title,pri,precondition,keywords';
$config->custom->fieldList['testreport'] = 'begin,end,owner,members,title,report';
diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php
index 18df8a5cae..6852d77255 100644
--- a/module/doc/view/browse.html.php
+++ b/module/doc/view/browse.html.php
@@ -57,7 +57,7 @@ var browseType = '';
-
+
doc->manageType);?>
diff --git a/module/doc/view/index.html.php b/module/doc/view/index.html.php
index d16ba749e7..7ddfd0bceb 100644
--- a/module/doc/view/index.html.php
+++ b/module/doc/view/index.html.php
@@ -41,7 +41,7 @@
$i = 0;
$subLibCount = count($subLibs['product'][$product->id]);
?>
-
+
{$lang->doclib->product} " : '';
echo html::a(inlink('objectLibs', "type=product&objectID=$product->id&from=doc"), $label . $product->name, '', "title='{$product->name}'");
diff --git a/module/product/model.php b/module/product/model.php
index 56f7fce0e0..5f40d8fc07 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -81,7 +81,7 @@ class productModel extends model
setCookie("lastProduct", $productID, $this->config->cookieLife, $this->config->webRoot);
$currentProduct = $this->getById($productID);
$this->session->set('currentProductType', $currentProduct->type);
- $output = "
{$currentProduct->name} ";
+ $output = "
{$currentProduct->name} ";
if($isMobile) $output = "
{$currentProduct->name} ";
if($currentProduct->type == 'normal') unset($this->lang->product->menu->branch);
if($currentProduct->type != 'normal')
diff --git a/module/product/view/batchedit.html.php b/module/product/view/batchedit.html.php
index 8fbbf58909..9e64e6577c 100755
--- a/module/product/view/batchedit.html.php
+++ b/module/product/view/batchedit.html.php
@@ -20,10 +20,19 @@
config->product->edit->requiredFields) as $field)
+{
+ if($field)
+ {
+ $requiredFields[$field] = '';
+ if(strpos(",{$config->product->customBatchEditFields},", ",{$field},") !== false) $visibleFields[$field] = '';
+ }
}
?>