Merge changes for v2.2.3 (#100)

* Merge changes for v2.1.6 (#92) * DISCOVERYACCESS-7627 - for rbenv users * DISCOVERYACCESS-7627 - rails 6 required for cornell-blacklight * DISCOVERYACCESS-7627 - bump version number * DISCOVERYACCESS-7627 - rails 6 for cornell-blacklight * DISCOVERYACCESS-7627 - try rails 7 * DISCOVERYACCESS-7627 - back to rails 6.1 * DISCOVERYACCESS-7627 - bump version number * DISCOVERYACCESS-7627 - forgot save all * Update release notes Co-authored-by: James Reidy <jreidy@cornell.edu> * DISCOVERYACCESS-7838: update my account login page text * Merge changes for v2.2.0 (ReShare) to dev (#94) * WIP * Eliminate ilsapi cgi script reference (talk directly to illiad6.cgi) * Display pickup location for BD * Differentiate pending and available ReShare requests * Bump to v2.2.0 * Ensure ReShare results are only for the user's netid * Remove unused functions * Linting * Skip ILL items with status 'Request Sent to BD' * Avoid duplicate request entries * DISCOVERYACCESS-7964: update links to main site * DISCOVERYACCESS-7964: update link to fine rates * Merge changes for v2.2.2 (#97) * Merge changes for v2.2.1 to master (#96) * Merge changes for v2.1.6 (#92) * DISCOVERYACCESS-7627 - for rbenv users * DISCOVERYACCESS-7627 - rails 6 required for cornell-blacklight * DISCOVERYACCESS-7627 - bump version number * DISCOVERYACCESS-7627 - rails 6 for cornell-blacklight * DISCOVERYACCESS-7627 - try rails 7 * DISCOVERYACCESS-7627 - back to rails 6.1 * DISCOVERYACCESS-7627 - bump version number * DISCOVERYACCESS-7627 - forgot save all * Update release notes Co-authored-by: James Reidy <jreidy@cornell.edu> * DISCOVERYACCESS-7838: update my account login page text * Merge changes for v2.2.0 (ReShare) to dev (#94) * WIP * Eliminate ilsapi cgi script reference (talk directly to illiad6.cgi) * Display pickup location for BD * Differentiate pending and available ReShare requests * Bump to v2.2.0 * Ensure ReShare results are only for the user's netid * Remove unused functions * Linting * Skip ILL items with status 'Request Sent to BD' * Avoid duplicate request entries Co-authored-by: James Reidy <jreidy@cornell.edu> Co-authored-by: Melissa Wallace <mhk33@cornell.edu> * Handle 'checked out in FOLIO' * Don't create catalog links for ReShare items * Code cleanup * Don't show ReShare items with status REQ_CHECKED_IN * Show date shipped for ReShare items in pending requests * Remove nonfunctional checkbox selection from available requests. * Restore source badges for ILL items in checkouts list * Bump to v2.2.2 * Remove debug code --------- Co-authored-by: James Reidy <jreidy@cornell.edu> Co-authored-by: Melissa Wallace <mhk33@cornell.edu> * Fix bug causing requests not to load (#99) --------- Co-authored-by: James Reidy <jreidy@cornell.edu> Co-authored-by: Melissa Wallace <mhk33@cornell.edu>
cul-it · Mar 21, 2023 · b1b62a8 · b1b62a8
1 parent 160d532
commit b1b62a8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/app/controllers/my_account/account_controller.rb b/app/controllers/my_account/account_controller.rb
@@ -224,7 +224,7 @@ def get_illiad_data
           i['status'] = 'Charged'
           # checkouts << i
         else
-          i['shipped'] = ship_date(i)
+          i['shipped'] = reshare_shipped_status(i)
           pending_requests << i
         end
       end
@@ -364,12 +364,12 @@ def get_bd_requests
         # in the API response, but only provided as part of a marcxml description of the entire item record.
         marc = XmlSimple.xml_in(item['bibRecord'])
         f245 = marc['GetRecord'][0]['record'][0]['metadata'][0]['record'][0]['datafield'].find { |t| t['tag'] == '245' }
-        f245a = f245['subfield'].find { |sf| sf['code'] == 'a' }
-        f245b = f245['subfield'].find { |sf| sf['code'] == 'b' }
+        f245a = f245 && f245['subfield'].find { |sf| sf['code'] == 'a' }
+        f245b = f245 && f245['subfield'].find { |sf| sf['code'] == 'b' }
         title = f245b ? "#{f245a['content']} #{f245b['content']}" : f245a['content']
 
         f100 = marc['GetRecord'][0]['record'][0]['metadata'][0]['record'][0]['datafield'].find { |t| t['tag'] == '100' }
-        f100a = f100['subfield'].find { |sf| sf['code'] == 'a' }
+        f100a = f100 && f100['subfield'].find { |sf| sf['code'] == 'a' }
         author = f100a ? "#{f100a['content']}" : ''
 
         # For the final item, we add a fake item ID number (iid) for compatibility with other items in the system

diff --git a/lib/my_account/version.rb b/lib/my_account/version.rb
@@ -1,3 +1,3 @@
 module MyAccount
-  VERSION = "2.2.2"
+  VERSION = "2.2.3"
 end
diff --git a/release_notes.md b/release_notes.md
@@ -1,7 +1,9 @@
 # Release Notes - my-account
 
-## v2.2.2
+## v2.2.3
+- Fix bug in shipped date calculation that prevented requests from loading.
 
+## v2.2.2
 ### Improvements
 - Show date shipped for ReShare items in pending requests.
 - Show author for ReShare items in requests.