Summary: | Show waiting items for patron on return | ||
---|---|---|---|
Product: | Koha | Reporter: | Katrin Fischer <katrin.fischer> |
Component: | Circulation | Assignee: | Katrin Fischer <katrin.fischer> |
Status: | CLOSED FIXED | QA Contact: | Bugs List <koha-bugs> |
Severity: | enhancement | ||
Priority: | P5 - low | CC: | chris, gmcharlt, guillaume, nengard |
Version: | Main | ||
Hardware: | All | ||
OS: | All | ||
GIT URL: | Change sponsored?: | --- | |
Patch complexity: | --- | Documentation contact: | |
Documentation submission: | Text to go in the release notes: | ||
Version(s) released in: | Circulation function: | ||
Attachments: |
Patch adding new syspref HoldNotifyAtCheckin
Renamed syspref to WaitingNotifyAtCheckin Rebases patch, fixed whitespace errors Follow-up change Screenshot of the proposed change |
Description
Katrin Fischer
2011-03-21 19:53:33 UTC
Created attachment 3439 [details] [review] Patch adding new syspref HoldNotifyAtCheckin This patch adds a new sys pref HoldNotifyAtCheckin. If ON librarian will be notified of waiting holds at this branch for the patron whose books are checked in. If OFF (default) not message will be shown. Created attachment 3440 [details] [review] Renamed syspref to WaitingNotifyAtCheckin Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: Bug 5922: Notify of waiting holds at checkin Using index info to reconstruct a base tree... <stdin>:25: trailing whitespace. <stdin>:26: trailing whitespace. if ( C4::Context->preference("WaitingNotifyAtCheckin") ) { <stdin>:29: trailing whitespace. my $waiting_holds; <stdin>:34: trailing whitespace. } <stdin>:36: trailing whitespace. $template->param( warning: squelched 2 whitespace errors warning: 7 lines add whitespace errors. Falling back to patching base and 3-way merge... Auto-merging circ/returns.pl Auto-merging installer/data/mysql/de-DE/mandatory/sysprefs.sql Auto-merging installer/data/mysql/en/mandatory/sysprefs.sql Auto-merging installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql Auto-merging installer/data/mysql/it-IT/necessari/sysprefs.sql Auto-merging installer/data/mysql/pl-PL/mandatory/sysprefs.sql Auto-merging installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql Auto-merging installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref Auto-merging kohaversion.pl CONFLICT (content): Merge conflict in kohaversion.pl Failed to merge in the changes. Patch failed at 0001 Bug 5922: Notify of waiting holds at checkin When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". nengard@debian:~/kohaclone$ Created attachment 3458 [details] [review] Rebases patch, fixed whitespace errors Hi Guillaume Did you send the signed off patch? I cant find it on the mailing list Chirs Signed off patch has been sent today. Guillaume This bug is mentioned in: Bug 5922: Notify of waiting holds at checkin http://lists.koha-community.org/pipermail/koha-patches/2011-March/014235.html Bug 5922: Notify of waiting holds at checkin http://lists.koha-community.org/pipermail/koha-patches/2011-March/014236.html Bug 5922: Notify of waiting holds at checkin http://lists.koha-community.org/pipermail/koha-patches/2011-March/014237.html This was signed off, but status wasn't changed The signed off patch contains a patch of a patch??? Applied the original one instead. This was submitted for sign off before the feature freeze, pushing. Created attachment 4702 [details] [review] Follow-up change - Adding patron name to dialog - Styling dialog as a message rather than an alert since it's informational rather than a warning Created attachment 4703 [details]
Screenshot of the proposed change
Pushed the follow up. |