Merge branch 'master' into sprint/biz17
This commit is contained in:
@@ -539,7 +539,7 @@ $lang->doc->menu->api['subMenu']->struct = array('link' => "{$lang->doc->apiStru
|
||||
/* Report menu.*/
|
||||
$lang->report->menu = new stdclass();
|
||||
$lang->report->menu->screen = array('link' => "{$lang->screen->common}|screen|browse");
|
||||
$lang->report->menu->pivotTable = array('link' => "{$lang->report->pivotTable}|report|preview");
|
||||
$lang->report->menu->pivotTable = array('link' => "{$lang->report->pivotTable}|report|productsummary", 'alias' => 'projectdeviation,bugcreate,workload,bugassign');
|
||||
|
||||
/* Report menu order. */
|
||||
$lang->report->menuOrder[5] = 'screen';
|
||||
@@ -547,10 +547,10 @@ $lang->report->menuOrder[10] = 'pivotTable';
|
||||
|
||||
/*
|
||||
$lang->report->menu->pivotTable['subMenu'] = new stdclass();
|
||||
$lang->report->menu->pivotTable['subMenu']->product = array('link' => "{$lang->product->common}|report|preview|dimension=&group=product");
|
||||
$lang->report->menu->pivotTable['subMenu']->project = array('link' => "{$lang->project->common}|report|preview|dimension=&group=project");
|
||||
$lang->report->menu->pivotTable['subMenu']->test = array('link' => "{$lang->qa->common}|report|preview|dimension=&group=test");
|
||||
$lang->report->menu->pivotTable['subMenu']->staff = array('link' => "{$lang->system->common}|report|preview|dimension=&group=staff");
|
||||
$lang->report->menu->pivotTable['subMenu']->product = array('link' => "{$lang->product->common}|report|productsummary");
|
||||
$lang->report->menu->pivotTable['subMenu']->project = array('link' => "{$lang->project->common}|report|projectdeviation");
|
||||
$lang->report->menu->pivotTable['subMenu']->test = array('link' => "{$lang->qa->common}|report|bugcreate", 'alias' => 'bugassign');
|
||||
$lang->report->menu->pivotTable['subMenu']->staff = array('link' => "{$lang->system->common}|report|workload");
|
||||
|
||||
$lang->report->menu->pivotTable['menuOrder'][5] = 'product';
|
||||
$lang->report->menu->pivotTable['menuOrder'][10] = 'project';
|
||||
|
||||
Reference in New Issue
Block a user