* Fix bug #47924, set viewType in tree::edit.
This commit is contained in:
@@ -56,6 +56,7 @@ class treeEditor extends wg
|
||||
$editType = $this->prop('type');
|
||||
$selected = $this->prop('selected');
|
||||
$typeList = array('task' => 'T', 'bug' => 'B', 'case' => 'C');
|
||||
$viewType = data('viewType') ? data('viewType') : '';
|
||||
|
||||
foreach($items as $key => $item)
|
||||
{
|
||||
@@ -82,7 +83,7 @@ class treeEditor extends wg
|
||||
$item['actions'] = array();
|
||||
$item['actions']['items'] = array();
|
||||
|
||||
if($canEdit) $item['actions']['items'][] = array('key' => 'edit', 'icon' => 'edit', 'data-toggle' => 'modal', 'url' => createLink('tree', 'edit', 'moduleID=' . $item['id'] . '&type=' . $item['type']));
|
||||
if($canEdit) $item['actions']['items'][] = array('key' => 'edit', 'icon' => 'edit', 'data-toggle' => 'modal', 'url' => createLink('tree', 'edit', 'moduleID=' . $item['id'] . '&type=' . ($viewType ? $viewType : $item['type'])));
|
||||
if($canSplit) $item['actions']['items'][] = array('key' => 'view', 'icon' => 'split', 'url' => $item['url'], 'data-app' => $app->tab);
|
||||
}
|
||||
else
|
||||
|
||||
@@ -73,6 +73,7 @@ formPanel
|
||||
) : null,
|
||||
formGroup
|
||||
(
|
||||
set::className($hidden ? 'hidden' : ''),
|
||||
set::name('name'),
|
||||
set::label($name),
|
||||
set::control('input'),
|
||||
@@ -80,7 +81,7 @@ formPanel
|
||||
),
|
||||
$module->type != 'line' ? formGroup
|
||||
(
|
||||
set::className($hidden ? 'moduleBox hidden' : 'moduleBox'),
|
||||
set::className('moduleBox ', $hidden ? 'hidden' : ''),
|
||||
set::label(($type == 'doc' or $type == 'api') ? $lang->tree->parentCate : $lang->tree->parent),
|
||||
picker
|
||||
(
|
||||
|
||||
Reference in New Issue
Block a user