diff --git a/module/product/ui/all.html.php b/module/product/ui/all.html.php index be37732494..4645b9695f 100644 --- a/module/product/ui/all.html.php +++ b/module/product/ui/all.html.php @@ -107,13 +107,17 @@ featureBar toolbar ( - item(set(array + modalTrigger ( - 'text' => $lang->export, - 'icon' => 'export', - 'class' => 'ghost text-darker', - 'url' => createLink('product', 'export', $browseType, "status=$browseType&orderBy=$orderBy"), - ))), + to::trigger(btn + ( + setClass('ghost text-darker'), + set::icon('export'), + $lang->export + )), + set::url(createLink('product', 'export', "status=$browseType&orderBy=$orderBy")), + set::type('ajax') + ), div(setClass('nav-divider')), $config->systemMode == 'ALM' ? modalTrigger ( @@ -124,8 +128,7 @@ toolbar $lang->product->editLine )), set::url(createLink('product', 'manageLine', $browseType)), - set::type('ajax'), - set::title('maintaince') + set::type('ajax') ) : NULL, item(set(array ( diff --git a/module/product/ui/export.html.php b/module/product/ui/export.html.php new file mode 100644 index 0000000000..489dac5f56 --- /dev/null +++ b/module/product/ui/export.html.php @@ -0,0 +1,14 @@ + +* @package product +* @link https://www.zentao.net +*/ +?> + + diff --git a/module/product/zen.php b/module/product/zen.php index 109c2d3650..f308c53852 100644 --- a/module/product/zen.php +++ b/module/product/zen.php @@ -401,7 +401,8 @@ class productZen extends product { $lines = $this->product->getLinePairs(); $users = $this->user->getPairs('noletter'); - $productStats = $this->product->getStats($orderBy, null, $status); + $products = $this->product->getList(0, $status); + $productStats = $this->product->getStats(array_keys($products), $orderBy, null, $status); foreach($productStats as $product) {