Merge pull request concretecms#12247 from aembler/release/9.3.5

Release/9.3.5

build/package.json

@@ -13,7 +13,7 @@
     "production": "mix --production"
   },
   "devDependencies": {
-    "@concretecms/bedrock": "^1.5.2",
+    "@concretecms/bedrock": "^1.5.3",
     "cross-env": "^5.1.1",
     "download": "~8.0.0",
     "grunt": "^1.5.3",

build/tasks/build-release/download.js

@@ -3,7 +3,7 @@
 const download = require('download');
 
 module.exports = function(grunt, config, parameters, done) {
-	var zipUrl = parameters.releaseSourceZip || 'https://github.com/concretecms/concretecms/archive/refs/tags/9.3.4.zip';
+	var zipUrl = parameters.releaseSourceZip || 'https://github.com/concretecms/concretecms/archive/refs/tags/9.3.5.zip';
 	var workFolder = parameters.releaseWorkFolder || './release';
 	function endForError(e) {
 		process.stderr.write(e.message || e);

concrete/blocks/top_navigation_bar/view.php

@@ -77,7 +77,15 @@
                              */
                             if (count($item->getChildren()) > 0) { ?>
                                 <li class="nav-item dropdown">
-                                    <a class="nav-link<?= $item->isActiveParent() ? " nav-path-selected" : ""; ?> dropdown-toggle<?= $item->isActive() ? " active" : ""; ?>" data-bs-toggle="dropdown" target="<?=$controller->getPageItemNavTarget($item)?>" href="<?= $item->getUrl() ?>">
+                                    <?php
+                                    // IMPORTANT NOTE! TO ANYONE WHO MIGHT WANT TO SWAP OUT DATA-CONCRETE-TOGGLE WITH DATA-BS-TOGGLE (see here: https://github.com/concretecms/concretecms/pull/12172)
+                                    // These are `data-concrete-toggle` because we need some custom behavior here. We don't just want to toggle the dropdowns, we need them to behave differently than bootstrap.
+                                    // Our dropdowns toggle on hover, but when clicked we want them to GO to the page (see the bug reported here): https://github.com/concretecms/concretecms/issues/12226
+                                    // So what do we do? We make sure that we include the navigation feature. This SHOULD automatically be included by the Top Navigation Bar. And if your theme doesn't include
+                                    // it, then it is included by the fallback asset inclusion routine. I strongly suspect that the original poster in issue #12172 had marked their theme as already including the
+                                    // navigation feature, but they hadn't actually included navigation/frontend.js in their theme's javascript.
+                                    ?>
+                                    <a class="nav-link<?= $item->isActiveParent() ? " nav-path-selected" : ""; ?> dropdown-toggle<?= $item->isActive() ? " active" : ""; ?>" data-concrete-toggle="dropdown" target="<?=$controller->getPageItemNavTarget($item)?>" href="<?= $item->getUrl() ?>">
                                         <?=h($item->getName())?>
                                     </a>
                                     <ul class="dropdown-menu">

concrete/blocks/youtube/form_setup_html.php

@@ -155,7 +155,7 @@
                 </div>
 
                 <div class="form-check">
-                    <?php echo $form->checkbox('iv_load_policy', '1', isset($iv_load_polict) && $iv_load_policy == 3); ?>
+                    <?php echo $form->checkbox('iv_load_policy', '1', isset($iv_load_policy) && $iv_load_policy == 3); ?>
                     <?php echo $form->label("iv_load_policy", t('Hide annotations by default'), ["class" => "form-check-label"]); ?>
                 </div>
 

concrete/config/concrete.php

@@ -6,9 +6,9 @@
      *
      * @var string
      */
-    'version' => '9.3.4',
-    'version_installed' => '9.3.4',
-    'version_db' => '20240711000000', // the key of the latest database migration
+    'version' => '9.3.5',
+    'version_installed' => '9.3.5',
+    'version_db' => '20240910000000', // the key of the latest database migration
 
     /*
      * Installation status

concrete/elements/pages/schedule.php

@@ -72,7 +72,7 @@
 <?php } ?>
 
 <div class="dialog-buttons">
-    <button type="submit" name="action" value="schedule" class="btn btn-primary">
+    <button type="submit" name="action" value="schedule" class="btn btn-primary ccm-check-in-schedule">
         <?= t('Schedule') ?>
     </button>
 </div>

concrete/single_pages/dashboard/system/express/entities/add.php

@@ -22,7 +22,7 @@
 <form method="post" class="ccm-dashboard-content-form" action="<?php echo $view->action('add') ?>">
     <?php echo $token->output('add_entity') ?>
 
-    <div class="form-group <?php if ($error->containsField('name')) { ?>has-error<?php } ?>">
+    <div class="form-group <?php if ($error->containsField('name')) { ?>has-validation<?php } ?>">
         <?php echo $form->label('name', t('Name')); ?>
 
         <div class="float-end">
@@ -31,14 +31,17 @@
             </span>
         </div>
 
-        <?php echo $form->text('name', '', ['autofocus' => 'autofocus']) ?>
+        <?php echo $form->text('name', '', [
+            'class' => $error->containsField('name') ? 'is-invalid' : null,
+            'autofocus' => 'autofocus'
+        ]) ?>
 
         <p class="help-block">
             <?php echo t('The name is how your entity will appear in the Dashboard.') ?>
         </p>
     </div>
 
-    <div class="form-group <?php if ($error->containsField('handle')) { ?>has-error<?php } ?>">
+    <div class="form-group <?php if ($error->containsField('handle')) { ?>has-validation<?php } ?>">
         <?php echo $form->label('handle', t('Handle')); ?>
 
         <div class="float-end">
@@ -47,16 +50,22 @@
             </span>
         </div>
 
-        <?php echo $form->text('handle') ?>
+        <?php echo $form->text('handle', ['class' => $error->containsField('handle') ? 'is-invalid' : null]) ?>
 
         <p class="help-block">
             <?php echo t('A unique string consisting of lowercase letters and underscores only.') ?>
         </p>
     </div>
 
-    <div class="form-group">
+    <div class="form-group <?php if ($error->containsField('plural_handle')) { ?>has-validation<?php } ?>">
+        <div class="float-end">
+            <span class="text-muted small">
+                <?php echo t('Required') ?>
+            </span>
+        </div>
+
         <?php echo $form->label('plural_handle', t('Plural Handle')); ?>
-        <?php echo $form->text('plural_handle') ?>
+        <?php echo $form->text('plural_handle', ['class' => $error->containsField('plural_handle') ? 'is-invalid' : null]) ?>
 
         <p class="help-block">
             <?php echo t('The plural representation of the handle above. Used to retrieve this entity if it is used in associations.') ?>

concrete/single_pages/dashboard/system/multilingual/setup.php

@@ -121,28 +121,28 @@
     <div class="form-group">
         <div class="form-check">
             <?= $form->checkbox('redirectHomeToDefaultLocale', 1, $redirectHomeToDefaultLocale) ?>
-            <label>
-                <span><?= t('Redirect home page to default locale.') ?></span>
+            <label class="form-check-label" for="redirectHomeToDefaultLocale">
+                <?= t('Redirect home page to default locale.') ?>
             </label>
         </div>
-        <div style="margin-left: 20px">
+        <div class="ms-4">
             <div class="form-check <?= $redirectHomeToDefaultLocale ? '' : ' disabled' ?>">
                 <?= $form->checkbox('useBrowserDetectedLocale', 1, $useBrowserDetectedLocale, $redirectHomeToDefaultLocale ? [] : ['disabled' => 'disabled']) ?>
-                <label>
-                    <span><?= t('Attempt to use visitor\'s locale based on their browser information.') ?></span>
+                <label class="form-check-label" for="useBrowserDetectedLocale">
+                    <?= t('Attempt to use visitor\'s locale based on their browser information.') ?>
                 </label>
             </div>
         </div>
         <div class="form-check">
             <?= $form->checkbox('alwaysTrackUserLocale', 1, $alwaysTrackUserLocale) ?>
-            <label>
-                <span><?= t('Always track user locale.') ?> <i class="launch-tooltip control-label fas fa-question-circle" title="<?= h(t('Tracking user locales requires the creation of session cookies. Disable this option to avoid tracking user locale in case the session cookie is not yet set.')) ?>"></i></span>
+            <label class="form-check-label" for="alwaysTrackUserLocale">
+                <?= t('Always track user locale.') ?> <i class="launch-tooltip control-label fas fa-question-circle" title="<?= h(t('Tracking user locales requires the creation of session cookies. Disable this option to avoid tracking user locale in case the session cookie is not yet set.')) ?>"></i>
             </label>
         </div>
         <div class="form-check">
             <?= $form->checkbox('setAlternateHreflang', 1, $setAlternateHreflang) ?>
-            <label>
-                <span><?= t('Help search engines show the correct language version with Hreflang tags') ?></span>
+            <label class="form-check-label" for="setAlternateHreflang">
+                <?= t('Help search engines show the correct language version with Hreflang tags') ?>
             </label>
         </div>
     </div>

concrete/single_pages/dashboard/users/search/edit.php

@@ -417,7 +417,7 @@ class="fas fa-minus-circle"></i></a></div>
                     <div v-if="groups.length === 0" class="mb-3"><?= t('None') ?></div>
 
                     <h4><?= t('Add Group') ?></h4>
-                    <concrete-group-chooser mode="select" @select="addGroup"></concrete-group-chooser>
+                    <concrete-group-chooser mode="select" @select="addGroup" filter="assign"></concrete-group-chooser>
 
                 </div>
                 <div class="modal-footer">

concrete/src/Api/Controller/Pages.php

@@ -160,7 +160,7 @@ public function listPages()
         $list->setPermissionsChecker(
             function ($page) {
                 $permissions = new Checker($page);
-                return $permissions->canViewPageInSitemap();
+                return $permissions->canViewPage();
             }
         );
 
@@ -226,7 +226,7 @@ public function sitemapPages($pageID)
         $list->setPermissionsChecker(
             function ($page) {
                 $permissions = new Checker($page);
-                return $permissions->canViewPageInSitemap();
+                return $permissions->canViewPage();
             }
         );
 
@@ -383,7 +383,7 @@ public function update($cID)
         }
 
         $checker = new Checker($page);
-        if (!$checker->canEditPage()) {
+        if (!$checker->canEditPageContents()) {
             return $this->error(t('You do not have access to edit this page.', 401));
         }