http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6138 --- Comment #1 from Juan Romay Sieira <juan.sieira@xercode.es> 2011-07-14 18:22:02 UTC --- Created attachment 4632 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=4632 Patch to 3.4 version Patch to 3.4 version -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6138 Liz Rea <wizzyrea@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |wizzyrea@gmail.com --- Comment #3 from Liz Rea <wizzyrea@gmail.com> 2012-02-07 16:20:58 UTC --- Patch application failed: Applying: Show local help and isbd punctuation when we are cataloguing. /home/liz/kohaclone/.git/rebase-apply/patch:22: trailing whitespace. "SELECT tagfield,tagsubfield,liblibrarian,libopac,tab,mandatory,repeatable,authorised_value,authtypecode,value_builder,kohafield,seealso,hidden,isurl,link,defaultvalue,punctuation,help /home/liz/kohaclone/.git/rebase-apply/patch:191: trailing whitespace. background-color: #F0FFEF; error: patch failed: admin/marc_subfields_structure.pl:425 error: admin/marc_subfields_structure.pl: patch does not apply error: patch failed: installer/data/mysql/updatedatabase.pl:4259 error: installer/data/mysql/updatedatabase.pl: patch does not apply error: patch failed: koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css:133 error: koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css: patch does not apply error: patch failed: koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js:89 error: koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js: patch does not apply error: koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl: does not exist in index error: koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl: does not exist in index Patch failed at 0001 Show local help and isbd punctuation when we are cataloguing. -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6138 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |chris@bigballofwax.co.nz --- Comment #5 from Chris Cormack <chris@bigballofwax.co.nz> --- Falling back to patching base and 3-way merge... Auto-merging C4/Biblio.pm Auto-merging installer/data/mysql/kohastructure.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/js/staff-global.js CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt Failed to merge in the changes. -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6138 Juan Romay Sieira <juan.sieira@xercode.es> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #7536|0 |1 is obsolete| | --- Comment #6 from Juan Romay Sieira <juan.sieira@xercode.es> --- Created attachment 10404 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=10404&action=edit Patch to apply in current master Patch ready to apply in current master -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6138 Marc Véron <veron@veron.ch> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |veron@veron.ch --- Comment #7 from Marc Véron <veron@veron.ch> --- Wanted to sign off, but it does not apply, sorry. Marc -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6138 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6138 Marc Véron <veron@veron.ch> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA --- Comment #9 from Marc Véron <veron@veron.ch> --- I can see and edit the fields in teh framework. However when I try to edit a biblio record, help is not displayed. How I tested: 1) Go to administration->MARC Bibliographic framework->Marc Structure->Subfields->Edit subfields 2) Edit a subfield. Hit "Display more constraints" at the bottom of the screen. 3) Locate two new fields "Punctuation:" and "Help:" under "Advanced Constraints" 4) Put some values in both fields. 5) Save changes 6) Go to catalogiing->Add MARC Record, choose the framework you just used and go to the field where you added help 7) See a link "Show help" at the right of the field. 8) Hit the link. It is something like http://[YORSERVER]/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=#help_tag_942_subfield_n_175538_230054 9) Nothing happens. Result: Error in console: ReferenceError:fields_in_use is not defined. This error appears already when loading the page. It does not appear when I switch back to branch master. Same result while editng an existing biblio record. The HTML page source code where the error happens is as follows: ------------ <input type="text" id="tag_010_subfield_z_283956_276743" name="tag_010_subfield_z_283956_276743" value="" tabindex="1" punctuation="" size="67" maxlength="9999" class="input_marceditor" onfocus="javascript:GetPunctuation(this);" onblur="javascript:CheckPunctuation(this);" /> ------------ -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.