Merge branch 'master' of github.com:easysoft/zentaopms

2018-06-20 14:39:19 +08:00
parent 1b9f99f127 2594c5691c
commit f8cd274e20
3 changed files with 44 additions and 18 deletions
@@ -30,6 +30,18 @@ class bugModel extends model
        $this->loadModel('product')->setMenu($products, $productID, $branch, $moduleID, 'bug');
        $selectHtml = $this->product->select($products, $productID, 'bug', 'browse', '', $branch, $moduleID, 'bug');

+<<<<<<< HEAD
+        if($this->app->viewType == 'mhtml')
+        {
+            $productIndex = $selectHtml;
+        }
+        else
+        {
+            $this->app->loadLang('qa');
+            $productIndex  = '<div class="btn-group angle-btn"><div class="btn-group">' . html::a(helper::createLink('qa', 'index', 'locate=no'), $this->lang->qa->index, '', "class='btn'") . '</div></div>';
+            $productIndex .= $selectHtml;
+        }
+=======
        $pageNav     = '';
        $pageActions = '';
        $isMobile    = $this->app->viewType == 'mhtml';
@@ -86,6 +98,7 @@ class bugModel extends model
            }
        }
        $pageNav .= $selectHtml;
+>>>>>>> 6e25725965ce1935d9b2ee004157599f82dcfd15

        $this->lang->modulePageNav     = $pageNav;
        $this->lang->modulePageActions = $pageActions;