From b79fae5b8e5082d2e6a465bb081ee30aeab0a588 Mon Sep 17 00:00:00 2001 From: Kodi Date: Mon, 13 May 2024 16:02:13 -0700 Subject: [PATCH 1/3] Small Fixes Hide palace project collections for now Fix issue with Assabet event types (online vs in person) being flipped --- .../events/AssabetIndexer.java | 2 +- code/web/services/PalaceProject/Collections.php | 12 ++++++++++++ .../sys/PalaceProject/PalaceProjectCollection.php | 4 ---- code/web/sys/PalaceProject/PalaceProjectSetting.php | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) 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 index 54c9f41755..f8638536aa 100644 --- 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 index 4f35e201b6..5dab954c1e 100644 --- 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/PalaceProject/PalaceProjectCollection.php b/code/web/sys/PalaceProject/PalaceProjectCollection.php index c4944f6850..0cdde70fbe 100644 --- 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; - } } \ No newline at end of file diff --git a/code/web/sys/PalaceProject/PalaceProjectSetting.php b/code/web/sys/PalaceProject/PalaceProjectSetting.php index 3e4d673c10..f95d4fa84f 100644 --- 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' => [], From 6a188629995dfb891d32f5ad9e83e19377333c9b Mon Sep 17 00:00:00 2001 From: Mark Noble Date: Mon, 13 May 2024 17:08:45 -0600 Subject: [PATCH 2/3] Don't give a link to Palace Project Collections for editing --- code/web/sys/Account/User.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/web/sys/Account/User.php b/code/web/sys/Account/User.php index 89d41f9721..4c34068c7d 100644 --- 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', From fc4cdad010bfc04b2cf9690e79d83e417b61f12e Mon Sep 17 00:00:00 2001 From: Mark Noble Date: Mon, 13 May 2024 17:10:02 -0600 Subject: [PATCH 3/3] Build events indexer --- code/events_indexer/events_indexer.jar | Bin 612383 -> 612391 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/code/events_indexer/events_indexer.jar b/code/events_indexer/events_indexer.jar index b6eeb02a5f0b7bf9ce9725f065438d756559888e..5577843cc780689b33161c16c4db16828b6d020a 100644 GIT binary patch delta 11715 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 delta 11930 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%0DXkou~+DL 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