Bug 38050 - /lists

.prettierrc.js

@@ -1,6 +1,8 @@
 module.exports = {
     arrowParens: "avoid",
     trailingComma: "es5",
+    tabWidth: 4,
+    useTabs: false,
     overrides: [
         {
             files: "*.vue",
@@ -9,4 +11,4 @@ module.exports = {
             }
         }
     ]
-}
+}

C4/Auth.pm

@@ -1635,7 +1635,7 @@ sub check_api_auth {
             -secure => ( C4::Context->https_enabled() ? 1 : 0 ),
             -sameSite => 'Lax'
         );
-        return ( $return, $cookie, $session ); # return == 'ok' here
+        return ( $return, $cookie, $session->id ); # return == 'ok' here
 
     } else {
 

C4/Circulation.pm

@@ -780,7 +780,7 @@ sub CanBookBeIssued {
     my $onsite_checkout     = $params->{onsite_checkout}     || 0;
     my $override_high_holds = $params->{override_high_holds} || 0;
 
-    my $item_object = $params->{item}
+    my $item_object = !$barcode ? undef : $params->{item}
       // Koha::Items->find( { barcode => $barcode } );
 
     # MANDATORY CHECKS - unless item exists, nothing else matters

C4/Items.pm

@@ -1238,6 +1238,7 @@ sub SearchItems {
     } else {
         my $sortby = (0 < grep {$params->{sortby} eq $_} @columns)
             ? $params->{sortby} : 'itemnumber';
+        $sortby = 'cn_sort' if $sortby eq 'itemcallnumber';
         my $sortorder = (uc($params->{sortorder}) eq 'ASC') ? 'ASC' : 'DESC';
         $query .= qq{ ORDER BY $sortby $sortorder };
     }

C4/Languages.pm

@@ -191,57 +191,79 @@ sub getLanguages {
     my $lang = shift;
     my $isFiltered = shift;
 
-    my @languages_loop;
-    my $dbh=C4::Context->dbh;
+    my $dbh = C4::Context->dbh;
+
     my $default_language = 'en';
     my $current_language = $default_language;
-    my $language_list = $isFiltered ? C4::Context->preference("AdvancedSearchLanguages") : undef;
     if ($lang) {
         $current_language = regex_lang_subtags($lang)->{'language'};
     }
-    my $sth = $dbh->prepare('SELECT * FROM language_subtag_registry WHERE type=\'language\' ORDER BY description');
-    $sth->execute();
-    while (my $language_subtag_registry = $sth->fetchrow_hashref) {
-        my $desc;
-        # check if language name is stored in current language
-        my $sth4= $dbh->prepare("SELECT description FROM language_descriptions WHERE type='language' AND subtag =? AND lang = ?");
-        $sth4->execute($language_subtag_registry->{subtag},$current_language);
-        while (my $language_desc = $sth4->fetchrow_hashref) {
-             $desc=$language_desc->{description};
-        }
-        my $sth2= $dbh->prepare("SELECT * FROM language_descriptions LEFT JOIN language_rfc4646_to_iso639 on language_rfc4646_to_iso639.rfc4646_subtag = language_descriptions.subtag WHERE type='language' AND subtag =? AND language_descriptions.lang = ?");
-        if ($desc) {
-            $sth2->execute($language_subtag_registry->{subtag},$current_language);
-        }
-        else {
-            $sth2->execute($language_subtag_registry->{subtag},$default_language);
-        }
-        my $sth3 = $dbh->prepare("SELECT description FROM language_descriptions WHERE type='language' AND subtag=? AND lang=?");
-        # add the correct description info
-        while (my $language_descriptions = $sth2->fetchrow_hashref) {
-            $sth3->execute($language_subtag_registry->{subtag},$language_subtag_registry->{subtag});
-            my $native_description;
-            while (my $description = $sth3->fetchrow_hashref) {
-                $native_description = $description->{description};
-            }
 
-            # fill in the ISO6329 code
-            $language_subtag_registry->{iso639_2_code} = $language_descriptions->{iso639_2_code};
-            # fill in the current selected ui language's translation, as well as the native description of the language
-            if ($native_description) {
-                $language_subtag_registry->{language_description} = $language_descriptions->{description} || q{};
-                $language_subtag_registry->{language_description} .= " ($native_description)";
-            }
-            else {
-                $language_subtag_registry->{language_description} = $language_descriptions->{description};
-            }
-        }
-        # Do not push unless valid iso639-2 code
-        if ( $language_subtag_registry->{ iso639_2_code } and ( !$language_list || index (  $language_list, $language_subtag_registry->{ iso639_2_code } ) >= 0) ) {
-            push @languages_loop, $language_subtag_registry;
-        }
+    my $language_list = $isFiltered ? C4::Context->preference("AdvancedSearchLanguages") : undef;
+    my $language_list_cond = $language_list ? 'AND FIND_IN_SET(language_rfc4646_to_iso639.iso639_2_code, ?)' : '';
+
+    my $sth = $dbh->prepare("
+    SELECT
+    language_subtag_registry.*,
+    language_rfc4646_to_iso639.iso639_2_code,
+    CASE
+        -- If user's localized name of given lang is available
+        WHEN current_language_descriptions.description IS NOT NULL
+        THEN
+            CASE
+                -- Append native translation of given language if possible
+                WHEN native_language_descriptions.description IS NOT NULL
+                    AND native_language_descriptions.description != current_language_descriptions.description
+                THEN CONCAT(current_language_descriptions.description, ' (', native_language_descriptions.description, ')')
+                ELSE current_language_descriptions.description
+            END
+        ELSE -- fall back to English description
+            CASE
+                -- Append native translation of given language if possible
+                WHEN native_language_descriptions.description IS NOT NULL
+                    AND native_language_descriptions.description != language_subtag_registry.description
+                THEN CONCAT(language_subtag_registry.description, ' (', native_language_descriptions.description, ')')
+                ELSE language_subtag_registry.description
+            END
+    END AS language_description
+
+    -- Useful if debugging the query:
+    -- current_language_descriptions.description AS _current_language_descriptions_description,
+    -- native_language_descriptions.description AS _native_language_descriptions_description
+
+    FROM language_subtag_registry
+
+    -- Grab ISO code for language
+    INNER JOIN language_rfc4646_to_iso639
+    ON language_rfc4646_to_iso639.rfc4646_subtag = language_subtag_registry.subtag
+    AND language_rfc4646_to_iso639.iso639_2_code IS NOT NULL
+
+    -- Grab language name in user's current language
+    LEFT JOIN language_descriptions current_language_descriptions
+    ON current_language_descriptions.subtag = language_subtag_registry.subtag
+    AND current_language_descriptions.lang = ?
+    AND current_language_descriptions.type = 'language'
+
+    -- Grab language name in the given language itself
+    LEFT JOIN language_descriptions native_language_descriptions
+    ON native_language_descriptions.subtag = language_subtag_registry.subtag
+    AND native_language_descriptions.lang = language_subtag_registry.subtag
+    AND native_language_descriptions.type = 'language'
+
+    WHERE language_subtag_registry.type = 'language'
+    ${language_list_cond}");
+
+    if ($language_list) {
+        $sth->execute($current_language, join ',' => split(/,|\|/, $language_list));
+    } else {
+        $sth->execute($current_language);
+    }
+
+    my @languages_list;
+    while (my $row = $sth->fetchrow_hashref) {
+        push @languages_list, $row;
     }
-    return \@languages_loop;
+    return \@languages_list;
 }
 
 sub _get_opac_language_dirs {

C4/Reserves.pm

@@ -1776,8 +1776,9 @@ sub _koha_notify_reserve {
             message_name => 'Hold_Filled'
     } );
 
-    my $library = Koha::Libraries->find( $hold->branchcode );
-    my $from_email_address = $library->from_email_address;
+    my $library             = Koha::Libraries->find( $hold->branchcode );
+    my $from_email_address  = $library->from_email_address;
+    my $reply_email_address = $library->inbound_email_address;
 
     my %letter_params = (
         module => 'reserves',
@@ -1812,6 +1813,7 @@ sub _koha_notify_reserve {
                     letter                 => $letter,
                     borrowernumber         => $borrowernumber,
                     from_address           => $from_email_address,
+                    reply_address          => $reply_email_address,
                     message_transport_type => $mtt,
                 }
             );

C4/SIP/Sip/MsgType.pm

@@ -339,7 +339,7 @@ sub handle {
     # Set system preference overrides, first global, then account level
     # Clear overrides from previous message handling first
     foreach my $key ( keys %ENV ) {
-        delete $ENV{$key} if index($key, 'OVERRIDE_SYSPREF_') > 0;
+        delete $ENV{$key} if index($key, 'OVERRIDE_SYSPREF_') == 0;
     }
     foreach my $key ( keys %{ $config->{'syspref_overrides'} } ) {
         $ENV{"OVERRIDE_SYSPREF_$key"} = $config->{'syspref_overrides'}->{$key};

Koha.pm

@@ -29,7 +29,7 @@ use vars qw{ $VERSION };
 # - #4 : the developer version. The 4th number is the database subversion.
 #        used by developers when the database changes. updatedatabase take care of the changes itself
 #        and is automatically called by Auth.pm when needed.
-$VERSION = "24.12.00.002";
+$VERSION = "24.12.00.003";
 
 sub version {
     return $VERSION;