From 3257da64686c6a0a2aeb286ffb4ac647e0f7887f Mon Sep 17 00:00:00 2001 From: Robert Lange <robert.lange@uni-leipzig.de> Date: Fri, 8 Oct 2021 17:48:54 +0200 Subject: [PATCH] refs #18272 [fid] minimize delta to finc --- local/alpha/config/vufind/config.ini | 8 ++++---- .../templates/myresearch/bulk-action-buttons.phtml | 6 +++--- .../templates/myresearch/bulk-action-buttons.phtml | 0 3 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 themes/foundation5/templates/myresearch/bulk-action-buttons.phtml diff --git a/local/alpha/config/vufind/config.ini b/local/alpha/config/vufind/config.ini index addf3822b06..95cac8f698a 100644 --- a/local/alpha/config/vufind/config.ini +++ b/local/alpha/config/vufind/config.ini @@ -2,21 +2,21 @@ ;##################### DO NOT DELETE THIS HEADER #################### ;################### Leipzig University Library © 2015 ############## ; -; This is the ISIL-instance-specific default INI-file and inherits +; This is the default ALPHA-INI-file and inherits ; all the settings from the INI-file defined in [Parent_Config] which ; points to the default INI-file located in the folder vufind2/local ; [Parent_Config] -relative_path = ../../../local/config/vufind/export.ini +relative_path = ../../../config/vufind/config.ini ; A comma-separated list of config sections from the parent which should be ; completely overwritten by the equivalent sections in this configuration; ; any sections not listed here will be merged on a section-by-section basis. -;override_full_sections = "EndNote" +;override_full_sections = "Languages,AlphaBrowse_Types" ; -; Add instance-specific customization after this header. +; Add ALPHA-specific customization after this header. ; ;##################### DO NOT DELETE THIS HEADER #################### ;#################################################################### diff --git a/themes/bootstrap3/templates/myresearch/bulk-action-buttons.phtml b/themes/bootstrap3/templates/myresearch/bulk-action-buttons.phtml index 5faab89bab0..c45b65be814 100644 --- a/themes/bootstrap3/templates/myresearch/bulk-action-buttons.phtml +++ b/themes/bootstrap3/templates/myresearch/bulk-action-buttons.phtml @@ -1,6 +1,6 @@ -<?php if (isset($locations)): ?> - <input type="hidden" name="listID" value="<?=$this->escapeHtmlAttr($locations->id)?>" /> - <input type="hidden" name="listName" value="<?=$this->escapeHtmlAttr($locations->title)?>" /> +<?php if (isset($list)): ?> + <input type="hidden" name="listID" value="<?=$this->escapeHtmlAttr($list->id)?>" /> + <input type="hidden" name="listName" value="<?=$this->escapeHtmlAttr($list->title)?>" /> <?php endif; ?> <?php $user = $this->auth()->isLoggedIn(); ?> <div class="bulkActionButtons"> diff --git a/themes/foundation5/templates/myresearch/bulk-action-buttons.phtml b/themes/foundation5/templates/myresearch/bulk-action-buttons.phtml deleted file mode 100644 index e69de29bb2d..00000000000 -- GitLab