diff --git a/module/file/view/printfiles.html.php b/module/file/view/printfiles.html.php index 6619845d38..de8b369563 100644 --- a/module/file/view/printfiles.html.php +++ b/module/file/view/printfiles.html.php @@ -22,7 +22,6 @@ $sessionString .= session_name() . '=' . session_id(); /* Download a file, append the mouse to the link. Thus we call decide to open the file in browser no download it. */ function downloadFile(fileID, extension, imageWidth, fileTitle) { - console.log(fileID, extension, imageWidth); if(!fileID) return; var fileTypes = 'txt,jpg,jpeg,gif,png,bmp'; var sessionString = ''; diff --git a/module/product/control.php b/module/product/control.php index 6dd9b750c1..fea42a7013 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -380,11 +380,8 @@ class product extends control if(!$product) die(js::error($this->lang->notFound) . js::locate('back')); $product->desc = $this->loadModel('file')->setImgSize($product->desc); - $this->product->setMenu($this->products, $productID); - $plans = $this->loadModel('productplan')->getList($productID, 0, 'unexpired', null, 'begin'); - /* Load pager. */ $this->app->loadClass('pager', $static = true); $pager = new pager(0, 30, 1); @@ -399,7 +396,7 @@ class product extends control $this->view->lines = array('') + $this->loadModel('tree')->getLinePairs(); $this->view->branches = $this->loadModel('branch')->getPairs($productID); $this->view->dynamics = $this->loadModel('action')->getDynamic('all', 'all', 'date_desc', $pager, $productID); - $this->view->plans = $plans; + $this->view->plans = $this->loadModel('productplan')->getList($productID, 0, 'unexpired', null, 'begin'); $this->display(); }