Merge pull request #1046 from vishal-singh-webkul/gli-2046

Fixed: Getting errors in the back office if the id in the URL is updated manually to an invalid one.

Author: rohit053

classes/order/Order.php

@@ -1805,7 +1805,7 @@ public function getOrderPaymentDetail()
             SELECT opd.`amount` as `real_paid_amount`, opd.*, op.*
             FROM `'._DB_PREFIX_.'order_payment_detail` opd
             INNER JOIN `'._DB_PREFIX_.'order_payment` op ON (opd.`id_order_payment` = op.`id_order_payment`)
-            WHERE `id_order` = '.$this->id
+            WHERE `id_order` = '.(int) $this->id
         );
     }
 

controllers/admin/AdminCmsContentController.php

@@ -85,6 +85,7 @@ public function viewAccess($disable = false)
 
     public function initContent()
     {
+        $this->loadObject(true);
         $this->initTabModuleList();
         $this->renderPageHeaderToolbar();
 
@@ -151,8 +152,9 @@ public function renderPageHeaderToolbar()
 
             if (Tools::getValue('addcms') !== false) {
                 $this->toolbar_title[] = $this->l('Add new');
-            } elseif ($id_cms_page) {
-                $cms_page = new CMS($id_cms_page);
+            } elseif ($id_cms_page
+                && Validate::isLoadedObject($cms_page = new CMS($id_cms_page))
+            ) {
                 $this->toolbar_title[] = sprintf($this->l('Edit: %s'), $cms_page->meta_title[$this->context->employee->id_lang]);
             }
         } else {

controllers/admin/AdminFeaturesController.php

@@ -452,10 +452,9 @@ public function initContent()
             $this->initToolbar();
             $this->initPageHeaderToolbar();
             if ($this->display == 'edit' || $this->display == 'add') {
-                if (!$this->loadObject(true)) {
-                    return;
+                if ($this->loadObject(true)) {
+                    $this->content .= $this->renderForm();
                 }
-                $this->content .= $this->renderForm();
             } elseif ($this->display == 'view') {
                 // Some controllers use the view action without an object
                 if ($this->className) {

controllers/admin/AdminNormalProductsController.php

@@ -1392,7 +1392,10 @@ public function postProcess()
             parent::postProcess();
         }
 
-        if ($this->display == 'edit' || $this->display == 'add') {
+        if (in_array($this->display, array('add', 'edit'))
+            && $this->tabAccess[$this->display] == '1'
+            && $this->loadObject(true)
+        ) {
             $this->addJqueryUI(array(
                 'ui.core',
                 'ui.widget'
@@ -2814,9 +2817,7 @@ public function renderForm()
         }
 
         // let's calculate this once for all
-        if (!Validate::isLoadedObject($this->object) && Tools::getValue('id_product')) {
-            $this->errors[] = 'Unable to load object';
-        } else {
+        if ($this->loadObject(true)) {
             $this->_displayDraftWarning($this->object->active);
 
             // if there was an error while saving, we don't want to lose posted data

controllers/admin/AdminOrdersController.php

@@ -980,7 +980,9 @@ public function setMedia()
         $this->addJS(_PS_JS_DIR_.'vendor/d3.v3.min.js');
 
         if ($this->tabAccess['edit'] == 1 && $this->display == 'view') {
-            $this->addJS(_PS_JS_DIR_.'admin/orders.js');
+            if ($this->loadObject()) {
+                $this->addJS(_PS_JS_DIR_.'admin/orders.js');
+            }
             // add js for reallocation process
             $this->addJS(_PS_JS_DIR_.'admin/reallocation.js');
             // $this->addJS(_PS_JS_DIR_.'admin/orders-product-event.js');
@@ -6912,4 +6914,4 @@ public function ajaxProcessChangeRoomTypeToReallocate()
 
         $this->ajaxDie(json_encode($result));
     }
-}
+}

controllers/admin/AdminProductsController.php

@@ -1486,6 +1486,7 @@ public function postProcess()
 
         if (in_array($this->display, array('add', 'edit'))
             && $this->tabAccess[$this->display] == '1'
+            && $this->loadObject(true)
         ) {
             $this->addJqueryUI(array(
                 'ui.core',
@@ -2862,9 +2863,7 @@ public function renderForm()
         }
 
         // let's calculate this once for all
-        if (!Validate::isLoadedObject($this->object) && Tools::getValue('id_product')) {
-            $this->errors[] = 'Unable to load object';
-        } else {
+        if ($this->loadObject(true)) {
             $this->_displayDraftWarning($this->object->active);
 
             // if there was an error while saving, we don't want to lose posted data

controllers/admin/AdminRequestSqlController.php

@@ -283,11 +283,9 @@ public function initContent()
         $this->initToolbar();
         $this->initPageHeaderToolbar();
         if ($this->display == 'edit' || $this->display == 'add') {
-            if (!$this->loadObject(true)) {
-                return;
+            if ($this->loadObject(true)) {
+                $this->content .= $this->renderForm();
             }
-
-            $this->content .= $this->renderForm();
         } elseif ($this->display == 'view') {
             // Some controllers use the view action without an object
             if ($this->className) {

modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php

@@ -104,6 +104,9 @@ public function renderList()
 
     public function renderForm()
     {
+        if (!$this->loadObject(true)) {
+            return;
+        }
         $smartyVars = array();
         //tinymce setup
         $smartyVars['path_css'] = _THEME_CSS_DIR_;
@@ -125,7 +128,7 @@ public function renderForm()
         $smartyVars['defaultCountry'] = $country->name[Configuration::get('PS_LANG_DEFAULT')];
 
         $idCountry = null;
-        if ($this->display == 'edit') {
+        if ($this->object->id) {
             $idHotel = Tools::getValue('id');
             $hotelBranchInfo = new HotelBranchInformation($idHotel);
             $objCategory = new Category($hotelBranchInfo->id_category);
@@ -168,13 +171,11 @@ public function renderForm()
                 }
             }
             $smartyVars['order_restrict_date_info'] = $restrictDateInfo;
-        }
-
-        // manage state option
-        if ($this->display == 'add') {
+        } else {
             $idCountry = Tools::getValue('hotel_country');
         }
 
+        // manage state option
         $stateOptions = null;
         if ($idCountry) {
             $stateOptions = State::getStatesByIdCountry($idCountry);

modules/hotelreservationsystem/controllers/admin/AdminHotelfeaturesController.php

@@ -58,6 +58,10 @@ public function renderView()
 
     public function renderForm()
     {
+        if (!$this->loadObject(true)) {
+            return;
+        }
+
         $smartyVars = array();
         //lang vars
         $languages = Language::getLanguages(false);
@@ -66,7 +70,7 @@ public function renderForm()
         $smartyVars['languages'] = $languages;
         $smartyVars['currentLang'] = $currentLang;
         $smartyVars['ps_img_dir'] = _PS_IMG_.'l/';
-        if ($id = Tools::getValue('id')) {
+        if ($id = $this->object->id) {
             $smartyVars['edit'] = 1;
             if (Validate::isLoadedObject($objFeatures = new HotelFeatures($id))) {
                 $featureInfo = (array) $objFeatures;

modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php

@@ -195,7 +195,7 @@ public function displayViewLink($token, $idOrderReturn, $name = null)
 
     public function renderView()
     {
-        if (!($objOrderReturn = $this->loadObject(true))) {
+        if (!($objOrderReturn = $this->loadObject())) {
             return;
         }
         $refundStatuses = OrderReturnStateCore::getOrderReturnStates($this->context->language->id);

modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRulesController.php

@@ -141,14 +141,13 @@ public function renderForm()
         $smartyVars = array();
         $objCurrency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT'));
         $smartyVars['objCurrency'] = $objCurrency;
-
-        if ($this->display == 'edit'
-            && $refundRuleInfo = $this->loadObject(true)
+        if (($refundRuleInfo = $this->loadObject(true))
+            && $this->object->id
         ) {
             $smartyVars['edit'] = 1;
             $idRefundRule = Tools::getValue('id_refund_rule');
             $objRefundRule = new HotelOrderRefundRules();
-            $smartyVars['refund_rules_info'] = (array)$refundRuleInfo;
+            $smartyVars['refund_rules_info'] = (array) $refundRuleInfo;
         }
 
         //lang vars