Merge pull request Aspen-Discovery#1806 from K-Alette/24.05.00

Small Fixes
PTFS-Europe · May 13, 2024 · 4ae3341 · 4ae3341
2 parents 934d160 + fc4cdad
commit 4ae3341
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 9 deletions.
diff --git a/code/events_indexer/events_indexer.jar b/code/events_indexer/events_indexer.jar
diff --git a/code/events_indexer/src/com/turning_leaf_technologies/events/AssabetIndexer.java b/code/events_indexer/src/com/turning_leaf_technologies/events/AssabetIndexer.java
@@ -197,7 +197,7 @@ void indexEvents() {
 
 							//get event type with location_virtual value
 							String eventType = getStringForKey(locationsForCurEvent, "location_virtual");
-							if (eventType != null && eventType.equals("1")){
+							if (eventType != null && eventType.equals("0")){
 								eventType = "In Person";
 							}else {
 								eventType = "Online";

diff --git a/code/web/services/PalaceProject/Collections.php b/code/web/services/PalaceProject/Collections.php
@@ -59,6 +59,18 @@ function canAddNew() {
 		return true;
 	}
 
+	function canBatchEdit() {
+		return false;
+	}
+
+	function canEdit(DataObject $object) {
+		return false;
+	}
+
+	function canEditList() {
+		return false;
+	}
+
 	function canDelete() {
 		return true;
 	}

diff --git a/code/web/sys/Account/User.php b/code/web/sys/Account/User.php
@@ -3683,13 +3683,13 @@ public function getAdminActions() {
 			$sections['palace_project'] = new AdminSection('Palace Project');
 			$palaceProjectSettingsAction = new AdminAction('Settings', 'Define connection information between Palace Project and Aspen Discovery.', '/PalaceProject/Settings');
 			$palaceProjectScopesAction = new AdminAction('Scopes', 'Define which records are loaded for each library and location.', '/PalaceProject/Scopes');
-			$palaceProjectCollectionsAction = new AdminAction('Collections', 'Defines the collections within a Palace Project Account.', '/PalaceProject/Collections');
+			//$palaceProjectCollectionsAction = new AdminAction('Collections', 'Defines the collections within a Palace Project Account.', '/PalaceProject/Collections');
 			if ($sections['palace_project']->addAction($palaceProjectSettingsAction, 'Administer Palace Project')) {
 				$palaceProjectSettingsAction->addSubAction($palaceProjectScopesAction, 'Administer Palace Project');
-				$palaceProjectSettingsAction->addSubAction($palaceProjectCollectionsAction, 'Administer Palace Project');
+				//$palaceProjectSettingsAction->addSubAction($palaceProjectCollectionsAction, 'Administer Palace Project');
 			} else {
 				$sections['palace_project']->addAction($palaceProjectScopesAction, 'Administer Palace Project');
-				$sections['palace_project']->addAction($palaceProjectCollectionsAction, 'Administer Palace Project');
+				//$sections['palace_project']->addAction($palaceProjectCollectionsAction, 'Administer Palace Project');
 			}
 			$sections['palace_project']->addAction(new AdminAction('Indexing Log', 'View the indexing log for Palace Project.', '/PalaceProject/IndexingLog'), [
 				'View System Reports',

diff --git a/code/web/sys/PalaceProject/PalaceProjectCollection.php b/code/web/sys/PalaceProject/PalaceProjectCollection.php
@@ -83,8 +83,4 @@ public static function getObjectStructure($context = ''): array {
 		];
 		return $structure;
 	}
-
-	public function getEditLink($context): string {
-		return '/PalaceProject/Collections?objectAction=edit&id=' . $this->id;
-	}
 }
diff --git a/code/web/sys/PalaceProject/PalaceProjectSetting.php b/code/web/sys/PalaceProject/PalaceProjectSetting.php
@@ -108,7 +108,7 @@ public static function getObjectStructure($context = ''): array {
 				'sortable' => false,
 				'storeDb' => true,
 				'allowEdit' => true,
-				'canEdit' => true,
+				'canEdit' => false,
 				'canAddNew' => false,
 				'canDelete' => false,
 				'additionalOneToManyActions' => [],