diff --git a/code/web/interface/themes/responsive/WebBuilder/grapesPage.tpl b/code/web/interface/themes/responsive/WebBuilder/grapesPage.tpl
index 30d60d1f1a..2c42da706d 100644
--- a/code/web/interface/themes/responsive/WebBuilder/grapesPage.tpl
+++ b/code/web/interface/themes/responsive/WebBuilder/grapesPage.tpl
@@ -2,9 +2,6 @@
- {if $canEdit}
-
- {/if}
{$title|escape: 'html'}
diff --git a/code/web/release_notes/24.12.00.MD b/code/web/release_notes/24.12.00.MD
index 9aa551ffd5..5077f5d24d 100644
--- a/code/web/release_notes/24.12.00.MD
+++ b/code/web/release_notes/24.12.00.MD
@@ -47,15 +47,23 @@
// james staub - Nashville
// alexander - PTFSE
+### Web Builder Updates
+- Remove edit button in admin view of Grapes JS Pages as breadcrumbs allow navigation back to the editor and are in keeping with the rest of Aspen. (*AB*)
// Chloe - PTFSE
+// Pedro - PTFSE
+
// Lucas - Theke
+ - The logs directory belongs to the appropriate user (Docker deployment) (*LM*)
// Tomas - Theke
// ByWater
+### Other Updates
+- Redirect to selfRegistrationUrl if the /MyAccount/SelfReg URL is accessed directly.(*PA*)
+
## This release includes code contributions from
### ByWater Solutions
-
@@ -70,6 +78,7 @@
### PTFS-Europe
- Alexander Blanchard (AB)
- Chloe Zermatten (CZ)
+ - Pedro Amorim (PA)
### Theke Solutions
- Lucas Montoya (LM)
diff --git a/code/web/services/MyAccount/SelfReg.php b/code/web/services/MyAccount/SelfReg.php
index 19335a32ae..04ab590736 100644
--- a/code/web/services/MyAccount/SelfReg.php
+++ b/code/web/services/MyAccount/SelfReg.php
@@ -12,6 +12,12 @@ function launch($msg = null) {
$selfRegFields = $catalog->getSelfRegistrationFields();
if ($library->enableSelfRegistration == 0) {
$this->display('selfRegistrationNotAllowed.tpl', 'Register for a Library Card', '');
+ } elseif ($library->enableSelfRegistration == 2) {
+ if (!empty($library->selfRegistrationUrl)) {
+ header("Location: {$library->selfRegistrationUrl}");
+ exit;
+ }
+ $this->display('selfRegistrationNotAllowed.tpl', 'Register for a Library Card', '');
} else {
if (isset($_REQUEST['submit'])) {
diff --git a/code/web/services/WebBuilder/GrapesPage.php b/code/web/services/WebBuilder/GrapesPage.php
index aaae1e742a..1b6ff2a767 100644
--- a/code/web/services/WebBuilder/GrapesPage.php
+++ b/code/web/services/WebBuilder/GrapesPage.php
@@ -42,8 +42,6 @@ function launch() {
$title = $this->grapesPage->title;
$interface->assign('id', $this->grapesPage->id);
$interface->assign('contents', $this->grapesPage->getFormattedContents());
- $editButton = $this->generateEditPageUrl();
- $interface->assign('editPageUrl', $editButton);
$canEdit = UserAccount::userHasPermission( 'Administer All Grapes Pages',
'Administer Library Grapes Pages');
$interface->assign('canEdit', $canEdit);
@@ -66,11 +64,6 @@ function canView(): bool {
return true;
}
- function generateEditPageUrl() {
- $objectId = $this->grapesPage->id;
- $templatesSelect - $this->grapesPage->templatesSelect;
- return '/services/WebBuilder/GrapesJSEditor?objectAction=edit&id=' . $objectId . '&tempalteId=' . $templatesSelect;
- }
function getBreadcrumbs(): array {
$breadcrumbs = [];
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index a4e05b92d8..6c13967ad0 100755
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -16,7 +16,7 @@ services:
volumes:
- ${ASPEN_DATA_DIR}/conf:/usr/local/aspen-discovery/sites/${SITE_NAME}
- ${ASPEN_DATA_DIR}/data:/data/aspen-discovery/${SITE_NAME}
- - ${ASPEN_DATA_DIR}/logs:/var/log/aspen-discovery
+ - ${ASPEN_DATA_DIR}/logs:/var/log/aspen-discovery/${SITE_NAME}
depends_on:
db:
condition: service_healthy
@@ -31,7 +31,7 @@ services:
volumes:
- ${ASPEN_DATA_DIR}/conf:/usr/local/aspen-discovery/sites/${SITE_NAME}
- ${ASPEN_DATA_DIR}/data:/data/aspen-discovery/${SITE_NAME}
- - ${ASPEN_DATA_DIR}/logs:/var/log/aspen-discovery
+ - ${ASPEN_DATA_DIR}/logs:/var/log/aspen-discovery/${SITE_NAME}
command:
- cron
depends_on:
@@ -52,7 +52,7 @@ services:
networks:
- net-aspen
healthcheck:
- interval: 60s
+ interval: 10s
retries: 10
test:
[
diff --git a/docker/files/scripts/createDirs.php b/docker/files/scripts/createDirs.php
index a8c9afa32e..50f0de49a0 100644
--- a/docker/files/scripts/createDirs.php
+++ b/docker/files/scripts/createDirs.php
@@ -126,7 +126,7 @@
exec("chmod -R 755 $logDir2");
}
- exec("chown $newOwner $logDir/*");
+ exec("chown -R $newOwner $logDir");
exec("chown -R $newOwner $logDir/logs");
//Conf directory
diff --git a/docker/files/scripts/cron.sh b/docker/files/scripts/cron.sh
index 1734745102..e5b614c441 100755
--- a/docker/files/scripts/cron.sh
+++ b/docker/files/scripts/cron.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
export CONFIG_DIRECTORY="/usr/local/aspen-discovery/sites/${SITE_NAME}"
@@ -10,6 +10,12 @@ if [ ! -f "$confSiteFile" ] ; then
exit 1
fi
+# Adjust permissions if required
+if [[ ! -z "${LOCAL_USER_ID}" && "${LOCAL_USER_ID}" != "33" ]]; then
+ echo "% Setting www-data to UID=${LOCAL_USER_ID}"
+ usermod -o -u ${LOCAL_USER_ID} "www-data"
+fi
+
# Move and create temporarily sym-links to etc/cron directory
sanitizedSitename=$(echo "$SITE_NAME" | tr -dc '[:alnum:]_')
cp "$CONFIG_DIRECTORY/conf/crontab_settings.txt" "/etc/cron.d/$sanitizedSitename"