|
Description
Caroline Cyr La Rose
2018-08-03 18:18:15 UTC
Created attachment 77484 [details] [review] Bug 21158: Add cronjob references to the system preference descriptions if a cronjob is required This patch adds references to cronjobs in the description of some system preferences. The following system preference description were modified: - StaticHoldsQueueWeight - ExpireReservesMaxPickUpDelay - AutoResumeSuspendedHolds - finesMode - DefaultLongOverdueLostValue - DefaultLongOverdueChargeValue - PatronSelfRegistrationExpireTemporaryAccountsDelay - PatronSelfRegistrationVerifyByEmail - EnhancedMessagingPreferences - NewItemsDefaultLocation - InProcessingToShelvingCart - ReturnToShelvingCart - ReturnToShelvingCart - AuthorityMergeLimit - OpacBrowser - OpacCloud - UsageStats - PurgeSuggestionsOlderThan - MembershipExpiryDaysNotice To test, check the above mentioned system preferences to make sure the sentence is there and it is correct. Ran into issue trying to apply: vagrant@kohadevbox:kohaclone(master)$ git bz apply -s 21158 Bug 21158 - Add cronjob references to the system preference descriptions if a cronjob is required 77484 - Bug 21158: Add cronjob references to the system preference descriptions if a cronjob is required Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 21158: Add cronjob references to the system preference descriptions if a cronjob is required /home/vagrant/kohaclone/.git/rebase-apply/patch:184: trailing whitespace. - "<br><strong>NOTE:</strong> This system preference requires the <code>misc/cronjobs/holds/build_holds_queue.pl</code> cronjob. Ask you system administrator to schedule it." warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref <stdin>:184: trailing whitespace. - "<br><strong>NOTE:</strong> This system preference requires the <code>misc/cronjobs/holds/build_holds_queue.pl</code> cronjob. Ask you system administrator to schedule it." warning: 1 line applied after fixing whitespace errors. Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref Failed to merge in the changes. Patch failed at 0001 Bug 21158: Add cronjob references to the system preference descriptions if a cronjob is required The copy of the patch that failed is found in: /home/vagrant/kohaclone/.git/rebase-apply/patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-21158-Add-cronjob-references-to-the-system-pre-0j9bCi.patch Created attachment 80953 [details] [review] Bug 21158: Add cronjob references to the system preference descriptions if a cronjob is required This patch adds references to cronjobs in the description of some system preferences. The following system preference description were modified: - StaticHoldsQueueWeight - ExpireReservesMaxPickUpDelay - AutoResumeSuspendedHolds - finesMode - DefaultLongOverdueLostValue - DefaultLongOverdueChargeValue - PatronSelfRegistrationExpireTemporaryAccountsDelay - PatronSelfRegistrationVerifyByEmail - EnhancedMessagingPreferences - NewItemsDefaultLocation - InProcessingToShelvingCart - ReturnToShelvingCart - ReturnToShelvingCart - AuthorityMergeLimit - OpacBrowser - OpacCloud - UsageStats - PurgeSuggestionsOlderThan - MembershipExpiryDaysNotice To test, check the above mentioned system preferences to make sure the sentence is there and it is correct. Created attachment 81608 [details] [review] Bug 21158: Add cronjob references to the system preference descriptions if a cronjob is required This patch adds references to cronjobs in the description of some system preferences. The following system preference description were modified: - StaticHoldsQueueWeight - ExpireReservesMaxPickUpDelay - AutoResumeSuspendedHolds - finesMode - DefaultLongOverdueLostValue - DefaultLongOverdueChargeValue - PatronSelfRegistrationExpireTemporaryAccountsDelay - PatronSelfRegistrationVerifyByEmail - EnhancedMessagingPreferences - NewItemsDefaultLocation - InProcessingToShelvingCart - ReturnToShelvingCart - ReturnToShelvingCart - AuthorityMergeLimit - OpacBrowser - OpacCloud - UsageStats - PurgeSuggestionsOlderThan - MembershipExpiryDaysNotice To test, check the above mentioned system preferences to make sure the sentence is there and it is correct. Followed test plan and patch is as described Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz> Created attachment 81795 [details] [review] Bug 21158: Add cronjob references to the system preference descriptions if a cronjob is required This patch adds references to cronjobs in the description of some system preferences. The following system preference description were modified: - StaticHoldsQueueWeight - ExpireReservesMaxPickUpDelay - AutoResumeSuspendedHolds - finesMode - DefaultLongOverdueLostValue - DefaultLongOverdueChargeValue - PatronSelfRegistrationExpireTemporaryAccountsDelay - PatronSelfRegistrationVerifyByEmail - EnhancedMessagingPreferences - NewItemsDefaultLocation - InProcessingToShelvingCart - ReturnToShelvingCart - ReturnToShelvingCart - AuthorityMergeLimit - OpacBrowser - OpacCloud - UsageStats - PurgeSuggestionsOlderThan - MembershipExpiryDaysNotice To test, check the above mentioned system preferences to make sure the sentence is there and it is correct. Followed test plan and patch is as described Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> https://bugs.koha-community.org/show_bug.cgi?id=12258 Created attachment 81796 [details] [review] Bug 12258: (QA follow-up) Add some missing rrrrrrs Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Awesome work all! Pushed to master for 18.11 Pushed to 18.05.x for 18.05.06... It's never a bad thing to be a little bit clearer. I prefer not to push to 17.11.x to avoid translation work (In reply to Katrin Fischer from comment #6) > Created attachment 81796 [details] [review] [review] > Bug 12258: (QA follow-up) Add some missing rrrrrrs > > Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Oups commit message is with wrong bug number 12258 instead of 21158. Why PatronSelfRegistrationVerifyByEmail? Also, all these paths are wrong for every installation except a dev installation... |