Merge branch '24.12.00' of https://github.com/Aspen-Discovery/aspen-d…

…iscovery into 24.12.00
PTFS-Europe · Nov 21, 2024 · dbdc774 · dbdc774
2 parents 7d5e6a7 + a1730ef
commit dbdc774
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 15 deletions.
diff --git a/code/web/interface/themes/responsive/WebBuilder/grapesPage.tpl b/code/web/interface/themes/responsive/WebBuilder/grapesPage.tpl
@@ -2,9 +2,6 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8">
-    {if $canEdit}
-      <div style="position:absolute;top:50px;right:10px"><button onclick="window.location.href='{$editPageUrl|escape: 'html'}'">{translate text="Edit Page" isPublicFacing=false}</button></div>
-    {/if}
     <title>{$title|escape: 'html'}</title>
   </head>
   <body>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"