Merge branch 'main' into gridproductimage

empiricompany · Mar 6, 2024 · ea049ba · ea049ba
2 parents e459ab6 + 304a23c
commit ea049ba
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 75 deletions.
diff --git a/app/code/core/Mage/Oauth/Model/Server.php b/app/code/core/Mage/Oauth/Model/Server.php
@@ -309,7 +309,7 @@ protected function _initToken()
             if (self::REQUEST_TOKEN == $this->_requestType) {
                 $this->_validateVerifierParam();
 
-                if (!hash_equals($this->_token->getVerifier(), $this->_protocolParams['oauth_verifier'])) {
+                if (!hash_equals((string)$this->_token->getVerifier(), $this->_protocolParams['oauth_verifier'])) {
                     $this->_throwException('', self::ERR_VERIFIER_INVALID);
                 }
                 if (!hash_equals((string)$this->_token->getConsumerId(), (string)$this->_consumer->getId())) {

diff --git a/app/code/core/Mage/Sales/Model/Observer.php b/app/code/core/Mage/Sales/Model/Observer.php
@@ -275,8 +275,7 @@ public function prepareProductEditFormRecurringProfile($observer)
         $dependencies = $block
             ->addFieldMap('is_recurring', 'product[is_recurring]')
             ->addFieldMap($profileElement->getHtmlId(), $profileElement->getName())
-            ->addFieldDependence($profileElement->getName(), 'product[is_recurring]', '1')
-            ->addConfigOptions(['levels_up' => 2]);
+            ->addFieldDependence($profileElement->getName(), 'product[is_recurring]', '1');
         $observer->getEvent()->getResult()->output .= $dependencies->toHtml();
     }
 

diff --git a/app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml b/app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml
@@ -198,10 +198,10 @@
         grid.reloadParams = {'selected_products[]':categoryProducts.keys()};
     }
     function categoryProductRowClick(grid, event){
-        var trElement = Event.findElement(event, 'tr');
+        var tdElement = Event.findElement(event, 'td');
         var isInput   = Event.element(event).tagName == 'INPUT';
-        if(trElement){
-            var checkbox = Element.getElementsBySelector(trElement, 'input');
+        if(tdElement){
+            var checkbox = Element.getElementsBySelector(tdElement, 'input');
             if(checkbox[0]){
                 var checked = isInput ? checkbox[0].checked : !checkbox[0].checked;
                 <?php echo $_gridJsObject ?>.setCheckboxChecked(checkbox[0], checked);

diff --git a/composer.lock b/composer.lock
diff --git a/js/mage/adminhtml/form.js b/js/mage/adminhtml/form.js
@@ -480,9 +480,7 @@ FormElementDependenceController.prototype = {
      * Misc. config options
      * Keys are underscored intentionally
      */
-    _config : {
-        levels_up : 1 // how many levels up to travel when toggling element
-    },
+    _config : {},
 
     getSelectValues : function(select) {
         var result = [];
@@ -512,16 +510,20 @@ FormElementDependenceController.prototype = {
      */
     trackChange : function(e, idTo, valuesFrom)
     {
-        let upLevels = this._config.levels_up;
-        let ele;
-        if (!$(idTo)) {
+        var ele = document.getElementById(idTo), cnf = this._config;
+        if (!ele) {
             idTo = 'row_' + idTo;
             ele = $(idTo);
             if (!ele) {
                 return;
             }
         } else {
-            ele = $(idTo).up(upLevels);
+            var closest = cnf.levels_up; // @deprecated
+            if ((typeof closest == 'number') && (closest > 1)) {
+                ele = ele.up(closest);
+            } else {
+                ele = ele.closest('tr');
+            }
         }
 
         // define whether the target should show up
@@ -548,11 +550,10 @@ FormElementDependenceController.prototype = {
 
         // toggle target row
         if (shouldShowUp) {
-            var currentConfig = this._config;
             ele.select('input', 'select', 'td').each(function (item) {
                 // don't touch hidden inputs (and Use Default inputs too), bc they may have custom logic
                 if ((!item.type || item.type != 'hidden') && !($(item.id+'_inherit') && $(item.id+'_inherit').checked)
-                    && !(currentConfig.can_edit_price != undefined && !currentConfig.can_edit_price)) {
+                    && !(cnf.can_edit_price != undefined && !cnf.can_edit_price)) {
                     item.disabled = false;
                 }
             });

diff --git a/lib/Varien/Directory/Collection.php b/lib/Varien/Directory/Collection.php
@@ -145,9 +145,6 @@ public function lastDir()
      */
     public static function getLastDir($path)
     {
-        if ($path == '') {
-            $path = $this->getPath();
-        }
         $last = strrpos($path, "/");
         return substr($path, $last + 1);
     }

diff --git a/skin/adminhtml/default/openmage/form.css b/skin/adminhtml/default/openmage/form.css