kanban->archivedCard;?>
@@ -76,10 +83,21 @@
status == 'done'):?>
kanban->finished;?>
+ fromType)):?>
createLink('kanban', 'viewCard', "cardID=$card->id", '', true), $card->name, '', "class='cardName iframe' data-toggle='modal' data-width='80%' title='$card->name'");?>
pri;?>
estimate and $card->estimate != 0) echo "
{$card->estimate}h";?>
+
+ title) ? $card->title : $card->name;
+ if(common::hasPriv($card->fromType, 'view')) echo html::a($this->createLink('productplan', 'view', "id=$card->fromID"), $name, '', "class='cardName' title='$name'");
+ if(!common::hasPriv($card->fromType, 'view')) echo "
$name
";
+ echo "
";
+ if($card->fromType != 'release' and isset($lang->{$card->fromType}->statusList[$card->objectStatus])) echo "" . $lang->{$card->fromType}->statusList[$card->objectStatus] . '';
+ if(isset($card->date) and !helper::isZeroDate($card->date)) echo "" . date("m/d", strtotime($card->date)) . ""
+ ?>
+
end) and !helper::isZeroDate($card->begin)):?>
begin)) . $lang->kanbancard->beginAB;?>
@@ -137,7 +155,7 @@
if($canRestore) echo html::a(inlink('restoreCard', "cardID={$card->id}"), $lang->kanban->restore, '', "class='btn btn-xs btn-primary' target='hiddenwin'");
- if($canDelete) echo html::a($this->createLink('kanban', 'deleteCard', "cardID=$card->id"), $lang->delete, '', "class='btn btn-xs delete-card' target='hiddenwin'");
+ if($canDelete) echo html::a($this->createLink('kanban', 'deleteCard', "cardID=$card->id"), $card->fromType == '' ? $lang->delete : $lang->unlink, '', "class='btn btn-xs delete-card' target='hiddenwin'");
?>
@@ -152,5 +170,17 @@ $(function()
{
$('#archivedCards').animate({right: -400}, 500);
});
+ $('.card-item').each(function()
+ {
+ var $item = $(this).children('.col-xs-10').children('.kanban-item');
+ var icon = '';
+
+ if($item.children('.build').length) icon = '
';
+ if($item.children('.execution').length) icon = '';
+ if($item.children('.productplan').length) icon = '';
+ if($item.children('.release').length) icon = '';
+
+ $item.children('.cardName').prepend(icon);
+ });
})
diff --git a/module/productplan/model.php b/module/productplan/model.php
index ad2d763bec..7ec779299b 100644
--- a/module/productplan/model.php
+++ b/module/productplan/model.php
@@ -1002,17 +1002,21 @@ class productplanModel extends model
*
* @param object $plan
* @param string $action
+ * @param string $module
* @access public
* @return void
*/
- public static function isClickable($plan, $action)
+ public static function isClickable($plan, $action, $module = 'productplan')
{
$action = strtolower($action);
- $clickable = commonModel::hasPriv('productplan', $action);
+ $clickable = commonModel::hasPriv($module, $action);
if(!$clickable) return false;
switch($action)
{
+ case 'create' :
+ if($plan->parent > 0 or strpos('done,closed', $plan->status) !== false) return false;
+ break;
case 'start' :
if($plan->status != 'wait' or $plan->parent < 0) return false;
break;
@@ -1025,8 +1029,100 @@ class productplanModel extends model
case 'activate' :
if($plan->status == 'wait' or $plan->status == 'doing' or $plan->parent < 0) return false;
break;
+ case 'delete' :
+ if($plan->parent < 0) return false;
+ break;
+ }
+
+ if($module == 'execution' && $action == 'create')
+ {
+ if($plan->parent < 0 || $plan->expired || in_array($plan->status, array('done', 'closed'))) return false;
+
+ $product = $this->loadModel('product')->getById($plan->product);
+ $branchList = $this->loadModel('branch')->getList($plan->product, 0, 'all');
+
+ $branchStatusList = array();
+ foreach($branchList as $productBranch) $branchStatusList[$productBranch->id] = $productBranch->status;
+
+ if($product->type != 'normal')
+ {
+ $branchStatus = isset($branchStatusList[$plan->branch]) ? $branchStatusList[$plan->branch] : '';
+ if($branchStatus == 'closed') return false;
+ }
}
return true;
}
+
+ /**
+ * Build operate menu.
+ *
+ * @param object $plan
+ * @param string $type
+ * @access public
+ * @return string
+ */
+ public function buildOperateMenu($plan, $type = 'view')
+ {
+ $params = "planID=$plan->id";
+
+ $menu = '';
+ $menu .= $this->buildMenu('productplan', 'start', $params, $plan, $type, 'play', 'hiddenwin', '', false, '', $this->lang->productplan->startAB);
+ $menu .= $this->buildMenu('productplan', 'finish', $params, $plan, $type, 'checked', 'hiddenwin', '', false, '', $this->lang->productplan->finishAB);
+ $menu .= $this->buildMenu('productplan', 'close', $params, $plan, $type, 'off', 'hiddenwin', 'iframe', true, '', $this->lang->productplan->closeAB);
+
+ if($type == 'view') $menu .= $this->buildMenu('productplan', 'activate', $params, $plan, $type, 'magic', 'hiddenwin', '', false, '', $this->lang->productplan->activateAB);
+
+ if($type == 'browse')
+ {
+ if($this->isClickable($plan, 'create', 'execution'))
+ {
+ $executionLink = $this->config->systemMode == 'new' ? '#projects' : helper::createLink('execution', 'create', "projectID=0&executionID=0©ExecutionID=0&plan=$plan->id&confirm=no&productID=$plan->product");
+ if($this->config->systemMode == 'new')
+ {
+ $menu .= html::a($executionLink, '', '', "data-toggle='modal' data-id='$plan->id' onclick='getPlanID(this, $plan->branch)' class='btn' title='{$this->lang->productplan->createExecution}'");
+ }
+ else
+ {
+ $menu .= html::a($executionLink, '', '', "class='btn' title='{$this->lang->productplan->createExecution}'");
+ }
+ }
+ else
+ {
+ $menu .= "";
+ }
+
+ if(common::hasPriv('productplan', 'linkStory', $plan) and $plan->parent >= 0)
+ {
+ $menu .= $this->buildMenu('productplan', 'view', "{$params}&type=story&orderBy=id_desc&link=true", $plan, $type, 'link', '', '', '', '', $this->lang->productplan->linkStory);
+ }
+ else
+ {
+ $menu .= "";
+ }
+
+ if(common::hasPriv('productplan', 'linkBug', $plan) and $plan->parent >= 0)
+ {
+ $menu .= $this->buildMenu('productplan', 'view', "{$params}&type=bug&orderBy=id_desc&link=true", $plan, $type, 'bug', '', '', '', '', $this->lang->productplan->linkBug);
+ }
+ else
+ {
+ $menu .= "";
+ }
+
+ $menu .= $this->buildMenu('productplan', 'edit', $params, $plan, $type);
+ }
+
+ $menu .= $this->buildMenu('productplan', 'create', "product={$plan->product}&branch={$plan->branch}&parent={$plan->id}", $plan, $type, 'split', '', '', '', '', $this->lang->productplan->children);
+
+ if($type == 'browse') $menu .= $this->buildMenu('productplan', 'delete', "{$params}&confirm=no", $plan, $type, 'trash', 'hiddenwin', '', '', $this->lang->productplan->delete);
+
+ if($type == 'view')
+ {
+ if(common::hasPriv('productplan', 'edit', $plan)) $menu .= html::a(helper::createLink('productplan', 'edit', $params), " " . $this->lang->edit, '', "class='btn btn-link' title='{$this->lang->edit}'");
+ if($plan->parent >= 0 && common::hasPriv('productplan', 'delete', $plan)) $menu .= html::a(helper::createLink('productplan', 'delete', $params), " " . $this->lang->delete, '', "class='btn btn-link' title='{$this->lang->delete}' target='hiddenwin'");
+ }
+
+ return $menu;
+ }
}
diff --git a/module/productplan/view/browsebylist.html.php b/module/productplan/view/browsebylist.html.php
index 776abaaf9a..db0c2e0b73 100644
--- a/module/productplan/view/browsebylist.html.php
+++ b/module/productplan/view/browsebylist.html.php
@@ -144,67 +144,7 @@
" . $this->loadModel('flow')->getFieldValue($extendField, $plan) . "";?>
-
- parent >= 0 )
- {
- $attr = "target='hiddenwin'";
- common::printIcon('productplan', 'start', "planID=$plan->id", $plan, 'list', 'play', '', '', false, $attr);
- common::printIcon('productplan', 'finish', "planID=$plan->id", $plan, 'list', 'checked', '', '', false, $attr);
- common::printIcon('productplan', 'close', "planID=$plan->id", $plan, 'list', 'off', '', 'iframe', true);
- }
-
- $attr = $plan->expired ? "disabled='disabled'" : '';
- $class = '';
- if($product->type != 'normal')
- {
- $branchStatus = isset($branchStatusList[$plan->branch]) ? $branchStatusList[$plan->branch] : '';
- if($branchStatus == 'closed') $class = 'disabled';
- }
- if(common::hasPriv('execution', 'create', $plan) and $plan->parent >= 0)
- {
- $disabled = '';
- $executionLink = $config->systemMode == 'new' ? '#projects' : $this->createLink('execution', 'create', "projectID=0&executionID=0©ExecutionID=0&plan=$plan->id&confirm=no&productID=$productID");
-
- if(in_array($plan->status, array('done', 'closed'))) $disabled = 'disabled';
-
- if($config->systemMode == 'new')
- {
- echo html::a($executionLink, '', '', "data-toggle='modal' data-id='$plan->id' onclick='getPlanID(this, $plan->branch)' class='btn {$disabled} {$class}' title='{$lang->productplan->createExecution}' $attr");
- }
- else
- {
- echo html::a($executionLink, '', '', "class='btn {$disabled}' title='{$lang->productplan->createExecution}' $attr");
- }
- }
- if(common::hasPriv('productplan', 'linkStory', $plan) and $plan->parent >= 0) echo html::a(inlink('view', "planID=$plan->id&type=story&orderBy=id_desc&link=true"), '', '', "class='btn' title='{$lang->productplan->linkStory}'");
- if(common::hasPriv('productplan', 'linkBug', $plan) and $plan->parent >= 0) echo html::a(inlink('view', "planID=$plan->id&type=bug&orderBy=id_desc&link=true"), '', '', "class='btn' title='{$lang->productplan->linkBug}'");
- common::printIcon('productplan', 'edit', "planID=$plan->id", $plan, 'list');
- if(common::hasPriv('productplan', 'create', $plan))
- {
- if($plan->parent > 0 or strpos('done,closed', $plan->status) !== false)
- {
- echo " ";
- }
- else
- {
- echo html::a($this->createLink('productplan', 'create', "product=$productID&branch=$branch&parent={$plan->id}"), "", '', "class='btn {$class}' title='{$this->lang->productplan->children}'");
- }
- }
-
- if(common::hasPriv('productplan', 'delete', $plan))
- {
- $deleteURL = '###';
- $disabled = 'disabled';
- if($plan->parent >= 0)
- {
- $deleteURL = $this->createLink('productplan', 'delete', "planID=$plan->id&confirm=no");
- $disabled = '';
- }
- echo html::a($deleteURL, '', 'hiddenwin', "class='btn {$disabled}' title='{$lang->productplan->delete}'");
- }
- ?>
- |
+
buildOperateMenu($plan, 'browse'); ?> |
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index 0ffd20a298..cff6af86a6 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -38,31 +38,7 @@