Merge remote-tracking branch 'origin/release-10.1' into release-10.1-…

…fix-theme-selector
demiankatz · Dec 10, 2024 · 80153e8 · 80153e8
2 parents a57f326 + 4143fbd
commit 80153e8
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 4 deletions.
diff --git a/build.xml b/build.xml
@@ -830,6 +830,9 @@ return [
             <exec executable="psql" checkreturn="true">
               <arg line="-c &quot;GRANT ALL ON DATABASE ${vufinddb} TO ${vufinddbuser};&quot; ${pgsqlrootuser}" />
             </exec>
+            <exec executable="psql" checkreturn="true">
+              <arg line="-c &quot;ALTER DATABASE ${vufinddb} OWNER TO ${vufinddbuser};&quot; ${pgsqlrootuser}" />
+            </exec>
           </then>
           <else>
             <exec executable="sudo">
@@ -849,6 +852,9 @@ return [
             <exec executable="sudo" checkreturn="true">
               <arg line="su -c &quot;psql -c 'GRANT ALL ON DATABASE ${vufinddb} TO ${vufinddbuser};'&quot; ${pgsqlrootuser}" />
             </exec>
+            <exec executable="sudo" checkreturn="true">
+              <arg line="su -c &quot;psql -c 'ALTER DATABASE ${vufinddb} OWNER TO ${vufinddbuser};'&quot; ${pgsqlrootuser}" />
+            </exec>
           </else>
         </if>
 

diff --git a/import/lib_local/postgresql-42.7.4.jar b/import/lib_local/postgresql-42.7.4.jar
diff --git a/import/lib_local/postgresql-9.1-902.jdbc4.jar b/import/lib_local/postgresql-9.1-902.jdbc4.jar
diff --git a/themes/bootstrap3/js/preview.js b/themes/bootstrap3/js/preview.js
@@ -45,6 +45,9 @@ function applyPreviewUrl($link, url) {
   // Update associated record thumbnail, if any:
   $link.parents('.result,.record')
     .find('.recordcover[data-linkpreview="true"]').parents('a').attr('href', url)
+    .off('click') // disable custom click handling
+    .attr('data-lightbox-image', null) // disable opening in lightbox
+    .attr('target', '_blank') // open consistently with preview button
     .attr('rel', 'noopener');
 }
 

diff --git a/themes/bootstrap3/templates/myresearch/editlist.phtml b/themes/bootstrap3/templates/myresearch/editlist.phtml
@@ -18,7 +18,7 @@
 <h2><?=$this->transEsc($pageTitle); ?></h2>
 
 <form class="form-edit-list" method="post" name="<?=$this->newList ? 'newList' : 'editListForm'?>" action="<?=$this->url('editList'); ?>">
-  <input type="hidden" name="id" value="<?=empty($listId = $this->list->getId()) ? 'NEW' : $this->escapeHtmlAttr($listId) ?>">
+  <input type="hidden" name="id" value="<?=$this->newList || empty($listId = $this->list->getId()) ? 'NEW' : $this->escapeHtmlAttr($listId) ?>">
   <?=$this->context($this)->renderInContext('cart/form-record-hidden-inputs.phtml', []); ?>
   <div class="form-group">
     <label class="control-label" for="list_title"><?=$this->transEsc('List'); ?>:</label>

diff --git a/themes/bootstrap3/templates/record/save.phtml b/themes/bootstrap3/templates/record/save.phtml
@@ -40,7 +40,7 @@
       <?php endif; ?>
       </select>
     <?php endif; ?>
-    <button type="submit" name="newList" class="btn btn-link" id="make-list"><?=$showLists ? $this->transEsc('or create a new list') : $this->transEsc('Create a List'); ?></button>
+    <button type="submit" name="newList" value="1" class="btn btn-link" id="make-list"><?=$showLists ? $this->transEsc('or create a new list') : $this->transEsc('Create a List'); ?></button>
   </div>
 
   <?php if ($showLists): ?>

diff --git a/themes/bootstrap5/js/preview.js b/themes/bootstrap5/js/preview.js
@@ -45,6 +45,9 @@ function applyPreviewUrl($link, url) {
   // Update associated record thumbnail, if any:
   $link.parents('.result,.record')
     .find('.recordcover[data-linkpreview="true"]').parents('a').attr('href', url)
+    .off('click') // disable custom click handling
+    .attr('data-lightbox-image', null) // disable opening in lightbox
+    .attr('target', '_blank') // open consistently with preview button
     .attr('rel', 'noopener');
 }
 

diff --git a/themes/bootstrap5/templates/myresearch/editlist.phtml b/themes/bootstrap5/templates/myresearch/editlist.phtml
@@ -18,7 +18,7 @@
 <h2><?=$this->transEsc($pageTitle); ?></h2>
 
 <form class="form-edit-list" method="post" name="<?=$this->newList ? 'newList' : 'editListForm'?>" action="<?=$this->url('editList'); ?>">
-  <input type="hidden" name="id" value="<?=empty($listId = $this->list->getId()) ? 'NEW' : $this->escapeHtmlAttr($listId) ?>">
+  <input type="hidden" name="id" value="<?=$this->newList || empty($listId = $this->list->getId()) ? 'NEW' : $this->escapeHtmlAttr($listId) ?>">
   <?=$this->context($this)->renderInContext('cart/form-record-hidden-inputs.phtml', []); ?>
   <div class="form-group">
     <label class="control-label" for="list_title"><?=$this->transEsc('List'); ?>:</label>

diff --git a/themes/bootstrap5/templates/record/save.phtml b/themes/bootstrap5/templates/record/save.phtml
@@ -40,7 +40,7 @@
       <?php endif; ?>
       </select>
     <?php endif; ?>
-    <button type="submit" name="newList" class="btn btn-link" id="make-list"><?=$showLists ? $this->transEsc('or create a new list') : $this->transEsc('Create a List'); ?></button>
+    <button type="submit" name="newList" value="1" class="btn btn-link" id="make-list"><?=$showLists ? $this->transEsc('or create a new list') : $this->transEsc('Create a List'); ?></button>
   </div>
 
   <?php if ($showLists): ?>