project->desc;?>
diff --git a/extension/lite/project/ext/view/edit.html.php b/extension/lite/project/ext/view/edit.html.php
new file mode 100755
index 0000000000..f4b7ec0dae
--- /dev/null
+++ b/extension/lite/project/ext/view/edit.html.php
@@ -0,0 +1,125 @@
+
+ * @package project
+ * @version $Id
+ * @link http://www.zentao.net
+ */
+?>
+app->getmoduleroot() . 'common/view/header.html.php';?>
+app->getmoduleroot() . 'common/view/kindeditor.html.php';?>
+
+execution->weekend);?>
+
+project->errorSameProducts);?>
+project->errorSameBranches);?>
+project->errorSamePlans);?>
+parent);?>
+id);?>
+project->longTime);?>
+
+
+
+project->notAllowRemoveProducts);?>
+project->linkedProjectsTip);?>
+
+parent ? $lang->project->subAclList : $lang->project->aclList;?>
+project->edit->requiredFields;?>
+
+project->currencySymbol)?>
+project->beginLetterParent);?>
+project->endGreaterParent);?>
+project->ignore);?>
+
+
+project->unLinkProductTip);?>
+model);?>
+
+
+
+
project->edit;?>
+
+
+
+
+ project->aclList, $project->acl == 'project' ? 'private' : 'open', "onclick='setWhite(this.value);'", 'block'));?>
+
+
+ project->subAclList, $project->acl, "onclick='setWhite(this.value);'", 'block'));?>
+
+app->getModuleRoot() . 'common/view/footer.html.php';?>
diff --git a/extension/lite/user/ext/view/batchcreate.lite.html.hook.php b/extension/lite/user/ext/view/batchcreate.lite.html.hook.php
index 59dcd3daa2..e69de29bb2 100644
--- a/extension/lite/user/ext/view/batchcreate.lite.html.hook.php
+++ b/extension/lite/user/ext/view/batchcreate.lite.html.hook.php
@@ -1,70 +0,0 @@
-
-dao->select("COUNT('*') as count")->from(TABLE_USER)
- ->where('deleted')->eq(0)
- ->beginIF($this->config->edition != 'open')->andWhere("visions")->ne('lite')->fi()
- ->fetch('count');
-js::set('userCount', $userCount);
-js::set('userMaxCount', $userMaxCount);
-js::set('noticeUserCreate', str_replace('%maxcount%', $userMaxCount, $lang->user->noticeUserCreate));
-
-if($this->config->edition != 'open')
-{
- $liteCount = $this->dao->select("COUNT('*') as count")->from(TABLE_USER)->where('deleted')->eq(0)->andWhere("visions")->eq('lite')->fetch('count');
- $liteMaxCount = $properties['lite']['value'];
- js::set('liteCount', $liteCount);
- js::set('liteMaxCount', $liteMaxCount);
- js::set('noticeFeedbackCreate', str_replace('%maxcount%', $liteMaxCount, $lang->user->noticeFeedbackCreate));
-}
-?>
-
-
diff --git a/module/action/model.php b/module/action/model.php
index 8dc16c0131..d75c6a0b65 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -482,19 +482,19 @@ class actionModel extends model
if($name) $action->extra = common::hasPriv('testtask', 'view') ? html::a(helper::createLink('testtask', 'view', "taskID=$action->extra"), $name) : $name;
}
elseif(strpos('feedback,ticket', $action->objectType) === false and $actionName == 'tostory')
- {
- $productShadow = $this->dao->select('*')->from(TABLE_PRODUCT)->where('id')->in($action->product)->fetch('shadow');
- $title = $this->dao->select('title')->from(TABLE_STORY)->where('id')->eq($action->extra)->fetch('title');
- $defaultExtra = "#$action->extra ". $title;
- if($productShadow === "1")
- {
- $projectID = $this->dao->select('project')->from(TABLE_PROJECTPRODUCT)->where('product')->in($action->product)->fetch('project');
- if($title) $action->extra = common::hasPriv('projectstory', 'story') && $projectID ? html::a(helper::createLink('projectstory', 'story', "projectID=$projectID"), $defaultExtra) : $defaultExtra;
- }
- else
- {
- if($title) $action->extra = common::hasPriv('story', 'view') ? html::a(helper::createLink('story', 'view', "storyID=$action->extra"), $defaultExtra) : $defaultExtra;
- }
+ {
+ $productShadow = $this->dao->select('shadow')->from(TABLE_PRODUCT)->where('id')->in(trim($action->product, ','))->fetch('shadow');
+ $title = $this->dao->select('title')->from(TABLE_STORY)->where('id')->eq($action->extra)->fetch('title');
+ $defaultExtra = "#$action->extra " . $title;
+ if($productShadow)
+ {
+ $projectID = $this->dao->select('project')->from(TABLE_PROJECTSTORY)->where('story')->eq($action->extra)->fetch('project');
+ if($title) $action->extra = (common::hasPriv('projectstory', 'view') and $projectID) ? html::a(helper::createLink('projectstory', 'view', "storyID={$action->extra}&projectID=$projectID"), $defaultExtra) : $defaultExtra;
+ }
+ else
+ {
+ if($title) $action->extra = common::hasPriv('story', 'view') ? html::a(helper::createLink('story', 'view', "storyID=$action->extra"), $defaultExtra) : $defaultExtra;
+ }
}
elseif($actionName == 'importedcard')
{
diff --git a/module/bug/control.php b/module/bug/control.php
index 9c3cbe038f..7413b08f0b 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -918,7 +918,8 @@ class bug extends control
$branches = $product->type == 'normal' ? array() : $this->loadModel('branch')->getPairs($bug->product);
$projects = $this->loadModel('product')->getProjectPairsByProduct($productID, $bug->branch);
-
+ $this->session->set("project", key($projects), 'project');
+
$this->executeHooks($bugID);
/* Header and positon. */
@@ -1259,6 +1260,7 @@ class bug extends control
/* Set plans. */
foreach($bugs as $bug)
{
+ $projectID = $bug->project;
$plans = $this->loadModel('productplan')->getPairs($productID, $bug->branch, '', true);
$plans = array('' => '', 'ditto' => $this->lang->bug->ditto) + $plans;
$bug->plans = $plans;
@@ -1281,6 +1283,13 @@ class bug extends control
/* Set product menu. */
$this->qa->setMenu($this->products, $productID, $branch);
+ $project = $this->loadModel('project')->getByID($projectID);
+ if($product->shadow and isset($project) and empty($project->multiple))
+ {
+ $this->config->bug->custom->batchEditFields = str_replace('productplan', '', $this->config->bug->custom->batchEditFields);
+ $this->config->bug->list->customBatchEditFields = str_replace(',productplan,', ',', $this->config->bug->list->customBatchEditFields);
+ }
+
$this->view->title = $product->name . $this->lang->colon . "BUG" . $this->lang->bug->batchEdit;
$this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID&branch=$branch"), $this->products[$productID]);
$this->view->plans = $plans;
@@ -1324,7 +1333,7 @@ class bug extends control
$showSuhosinInfo = common::judgeSuhosinSetting($countInputVars);
if($showSuhosinInfo) $this->view->suhosinInfo = extension_loaded('suhosin') ? sprintf($this->lang->suhosinInfo, $countInputVars) : sprintf($this->lang->maxVarsInfo, $countInputVars);
- /* Set Custom*/
+ /* Set Custom. */
foreach(explode(',', $this->config->bug->list->customBatchEditFields) as $field) $customFields[$field] = $this->lang->bug->$field;
$this->view->customFields = $customFields;
$this->view->showFields = $this->config->bug->custom->batchEditFields;
diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php
index 95cf0ba72d..b590236835 100644
--- a/module/bug/view/batchedit.html.php
+++ b/module/bug/view/batchedit.html.php
@@ -32,7 +32,7 @@
$requiredFields = array();
foreach(explode(',', $showFields) as $field)
{
- if($field)$visibleFields[$field] = '';
+ if($field) $visibleFields[$field] = '';
}
foreach(explode(',', $config->bug->edit->requiredFields) as $field)
{
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 6aa2684235..3e4629681a 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -125,7 +125,7 @@ if($this->app->tab == 'project') js::set('objectID', $bug->project);
-
job->jkHost; ?>
-
+
diff --git a/module/kanban/view/create.html.php b/module/kanban/view/create.html.php
index 2f70136716..ddf871f806 100644
--- a/module/kanban/view/create.html.php
+++ b/module/kanban/view/create.html.php
@@ -23,7 +23,7 @@
icons['copy'], 'muted') . ' ' . $lang->kanban->copy . $lang->kanban->common;?>
-