https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34842 --- Comment #1 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Hum, I don't understand. Is the config still exists or not? Is the syspref only a fallback?? * is($config->partner_code, "IL", "partner_code: Undefined partner_code is undefined."); Then it's not undefined! * Koha/Illrequest/Config.pm 258 partner_code => 'IL', then... 322 $configuration->{partner_code} = C4::Context->preference('ILLPartnerCode') || 'IL'; Please clarify! -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34842 --- Comment #2 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 156089 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=156089&action=edit Bug 34842: Fix Illrequest/Config.t if DB upgraded twice Not sure this is correct, but I think it is! -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34842 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |martin.renvoize@ptfs-europe | |.com --- Comment #3 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Pedro is back on Monday.. I'll poke him to take a look as I'm not entirely close enough myself to comment I'm afraid. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34842 --- Comment #4 from Pedro Amorim <pedro.amorim@ptfs-europe.com> --- (In reply to Jonathan Druart from comment #1)

Hum, I don't understand. Is the config still exists or not? Is the syspref only a fallback??

* is($config->partner_code, "IL", "partner_code: Undefined partner_code is undefined.");

Then it's not undefined!

* Koha/Illrequest/Config.pm 258 partner_code => 'IL', then... 322 $configuration->{partner_code} = C4::Context->preference('ILLPartnerCode') || 'IL';

Please clarify!

Hey! k-t-d has <partner_code>ILLLIBS</partner_code> in /etc/koha/sites/kohadev/koha-conf.xml. To preserve functionality, the upgrade takes whatever already exists in koha-conf.xml and sets that to the new system preference ILLPartnerCode. We don't need to worry about multiple upgrade because of INSERT IGNORE, i.e. it'll only read from the koha-conf.xml and put it in the database the first time. For clean-up, we could consider removing <partner_code> from koha-conf.xml after the upgrade has ran successfully, but it even if it's there - it's not being used anymore. I'm not sure about the change to Config.pm, see bug 21548. The fixes in the tests look good, I missed mocking the preference. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34842 Pedro Amorim <pedro.amorim@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34842 --- Comment #7 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- (In reply to Pedro Amorim from comment #5)

(In reply to Jonathan Druart from comment #0)

...

I think we should adjust the atomic update from bug 32911 and set the syspref to "IL" if the config was "ILLLIBS". What do you think Pedro?

But the config entry has been removed. We should actually remove it instead of modifying the value. That's why I was suggesting the update the syspref as well. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34842 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- QA Contact|testopia@bugs.koha-communit |m.de.rooy@rijksmuseum.nl |y.org | CC| |m.de.rooy@rijksmuseum.nl -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34842 --- Comment #10 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- (In reply to Marcel de Rooy from comment #9)

Reading the discussion, this feels like unfinished business.

I think this can go as it. It's the last missing piece to have Jenkins running the upgrade DB process... -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34842 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #156179|0 |1 is obsolete| | --- Comment #11 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 156362 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=156362&action=edit Bug 34842: Fix Illrequest/Config.t if DB upgraded twice Not sure this is correct, but I think it is! Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34842 --- Comment #13 from Pedro Amorim <pedro.amorim@ptfs-europe.com> --- I don't know. Bug 32911 is moving the value from koha-conf.xml to the sys pref to preserve functionality, as intended. If the value coming from koha-conf.xml is wrong, it's not its responsibility to address that, at least in my opinion. The problem is that in k-t-d, the value coming from koha-conf.xml is wrong. I don't fully agree with Jonathan's suggestion of setting it to 'IL' if 'ILLLIBS' because it sounds like a hardcoded fix for a problem that shouldn't occur in the first place, i.e. the value in koha-conf.xml should be a valid one (a category that exists), and if not, it needs to be fixed in the sys pref manually, as it would need to be in the koha-conf.xml anyway. Except now that is possible through the sys pref UI whereas before it was required to edit the koha-conf.xml manually. I'm not fully against Jonathan's suggestion it, either, of course. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34842 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Version(s)| |23.11.00 released in| | Status|Passed QA |Pushed to master -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34842 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |fridolin.somers@biblibre.co | |m --- Comment #16 from Fridolin Somers <fridolin.somers@biblibre.com> --- Depends on Bug 32911 not in 23.05.x -- You are receiving this mail because: You are watching all bug changes.