Merge branch '3.x' of https://github.com/modxcms/revolution into 3.x

Author: jenswittmann

.gitignore

@@ -59,3 +59,6 @@ composer.lock
 
 # ignore phpunit cache files
 .phpunit.result.cache
+
+# ignore .ddev dir
+/.ddev/

_build/build.sample.properties

@@ -14,7 +14,7 @@ composer.command = composer
 #project.name.fs = modx
 
 # Override to set the version and release strings
-#modx.core.version = 3.1.0
+#modx.core.version = 3.1.1
 #modx.core.release = dev
 
 # these properties require a local Git clone in order to produce distributions
@@ -28,7 +28,7 @@ composer.command = composer
 #build.nominify = true
 
 # Override to pull source from a specific ref in the git repository
-#build.src.tree = v3.1.0-pl
+#build.src.tree = v3.1.1-pl
 
 # Override to turn off the additional of timestamps to the distribution packages (used for nightlies)
 #build.timestamp = false

_build/build.xml

@@ -20,8 +20,8 @@
     <property name="project.manager.dir" value="${project.root.dir}/manager" />
 
     <!-- Set the project version -->
-    <property name="modx.core.version" value="3.1.0" />
-    <property name="modx.core.release" value="pl" />
+    <property name="modx.core.version" value="3.1.1" />
+    <property name="modx.core.release" value="dev" />
 
     <!-- Set some common build properties -->
     <property name="build.dir" value="${project.basedir}" />

core/docs/changelog.txt

@@ -2,6 +2,10 @@
 This file shows the changes in recent releases of MODX. The most current release is usually the
 development release, and is only shown to give an idea of what's currently in the pipeline.
 
+MODX Revolution 3.1.1-pl (TBD)
+====================================
+
+
 MODX Revolution 3.1.0-pl (December 18, 2024)
 ====================================
 - Make date display consistent across manager components (#16604)

core/docs/version.inc.php

@@ -2,8 +2,8 @@
 $v= [];
 $v['version']= '3'; // Current version.
 $v['major_version']= '1'; // Current major version.
-$v['minor_version']= '0'; // Current minor version.
-$v['patch_level']= 'pl'; // Current patch level.
+$v['minor_version']= '1'; // Current minor version.
+$v['patch_level']= 'dev'; // Current patch level.
 $v['code_name']= 'Revolution'; // Current codename.
 $v['distro']= '@git@';
 $v['full_version']= $v['version'] . ($v['major_version'] ? ".{$v['major_version']}" : ".0") . ($v['minor_version'] ? ".{$v['minor_version']}" : ".0") . ($v['patch_level'] ? "-{$v['patch_level']}" : "");

core/src/Revolution/Processors/Security/User/Create.php

@@ -290,8 +290,8 @@ public function sendNotificationEmail() {
      * @return array|string
      */
     public function cleanup() {
-        $passwordNotifyMethod = $this->getProperty('passwordnotifymethod', 's');
-        if (!empty($passwordNotifyMethod) && $passwordNotifyMethod == 's') {
+        $passwordNotifyMethod = $this->getProperty('passwordnotifymethod');
+        if (!empty($passwordNotifyMethod) && $passwordNotifyMethod === 's') {
             return $this->success($this->modx->lexicon('user_created_password_message', [
                 'username' => $this->object->get('username'),
                 'password' => $this->newPassword,

core/src/Revolution/Processors/Workspace/Packages/GetList.php

@@ -108,14 +108,14 @@ public function getSortClassKey()
      */
     public function prepareRow(xPDOObject $object)
     {
-        if ($object->get('installed') === '0000-00-00 00:00:00') {
-            $object->set('installed', null);
-        }
         $packageArray = $object->toArray();
+
+        $isInstalled = !$this->formatter->isEmpty($packageArray['installed']);
+        $packageArray['isInstalled'] = $isInstalled;
         $packageArray = $this->getVersionInfo($packageArray);
         $packageArray = $this->formatDates($packageArray);
-        $packageArray['iconaction'] = empty($packageArray['installed']) ? 'icon-install' : 'icon-uninstall';
-        $packageArray['textaction'] = empty($packageArray['installed']) ? $this->modx->lexicon('install') : $this->modx->lexicon('uninstall');
+        $packageArray['iconaction'] = !$isInstalled ? 'icon-install' : 'icon-uninstall';
+        $packageArray['textaction'] = !$isInstalled ? $this->modx->lexicon('install') : $this->modx->lexicon('uninstall');
         $packageArray = $this->getPackageMeta($object, $packageArray);
         $packageArray = $this->checkForUpdates($object, $packageArray);
 

manager/assets/modext/core/modx.layout.js

@@ -62,7 +62,7 @@ Ext.extend(MODx.Layout, Ext.Viewport, {
     ,splitBarMargin: 8
 
     /**
-     * @property {Object} focusRestoreEl - Set Focus back on the this Element
+     * @property {Object} focusRestoreEl - Set Focus back on this Element
      */
     ,focusRestoreEl: []
 
@@ -509,6 +509,7 @@ Ext.extend(MODx.Layout, Ext.Viewport, {
             submenu.classList.remove('active');
         } else {
             this.hideMenu();
+            var isClick = false;
             submenu.classList.add('active');
             setTimeout(() => {
                 var firstFocusEl = submenu.querySelectorAll('a')[0];
@@ -517,10 +518,16 @@ Ext.extend(MODx.Layout, Ext.Viewport, {
                 }
                 firstFocusEl.focus();
             }, 50);
+            var menuItemClicked = (e) => {
+                isClick = true;
+                window.removeEventListener('click', menuItemClicked);
+            };
             var focusRestore = (e) => {
                 requestAnimationFrame(() => {
                     if (!submenu.contains(document.activeElement)) {
-                        this.focusRestoreEl?.focus();
+                        if (!isClick) {
+                            this.focusRestoreEl?.focus();
+                        }
                         this.hideMenu();
                         window.removeEventListener('focusout', focusRestore);
                     }
@@ -533,6 +540,7 @@ Ext.extend(MODx.Layout, Ext.Viewport, {
                     window.removeEventListener('keyup', menuArrowKeysNavigation);
                 }
             };
+            window.addEventListener('click', menuItemClicked);
             window.addEventListener('focusout', focusRestore);
             window.addEventListener('keyup', menuArrowKeysNavigation);
         }