Display in ‘member details & OPAC Org & Parent org names eg Room 1, Paeroa Central School – otherwise room 1 is meaningless
Created attachment 4047 [details] [review] patch
Hi Srdjan, I see this bug has an attached patch - can you add some information about what this patch is supposed to do and how it can be tested? Thx!
To test: In case of a borrower of type "organistaion" (I), on circulation and member screens as well as opac screens, display full organisation name that is kept in "Other name". An example: If we had an organisation Surname: Room 1 Other name: Paeroa Central School it would display only "Room 1". With this patch it shold show "Room 1 (Paeroa Central School)" or similar.
Created attachment 4994 [details] [review] [SIGNED-OFF] Bug 6303: patron-title.inc to display properly title for borrowers of category_type 'I' Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> - checked opac and borrower account screens - checked normal and organisation patrons
Created attachment 4995 [details] screenshot showing change
sorry but the patch does not apply anymore, and there are a lot of conflicts it seems: [SIGNED-OFF] Bug 6303: patron-title.inc to display properly title for borrowers of category_type 'I' Apply? [yn] y Applying: Bug 6303: patron-title.inc to display properly title for borrowers of category_type 'I' /home/paul/koha.dev/koha-community/.git/rebase-apply/patch:53: trailing whitespace. # 'showname' which is the alternate form the user's first name if /home/paul/koha.dev/koha-community/.git/rebase-apply/patch:437: trailing whitespace. # in template <TMPL_IF name="I"> => instutitional (A for Adult, C for children) /home/paul/koha.dev/koha-community/.git/rebase-apply/patch:438: trailing whitespace. $template->param( $data->{'categorycode'} => 1 ); /home/paul/koha.dev/koha-community/.git/rebase-apply/patch:466: space before tab in indent. BORROWER_INFO => [ $borrower ], /home/paul/koha.dev/koha-community/.git/rebase-apply/patch:510: trailing whitespace. error: patch failed: C4/Members.pm:352 error: C4/Members.pm: patch does not apply error: patch failed: circ/circulation.pl:631 error: circ/circulation.pl: patch does not apply error: koha-tmpl/intranet-tmpl/prog/en/modules/members/messaging.tt: does not exist in index error: patch failed: koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt:19 error: koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt: patch does not apply error: patch failed: koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt:201 error: koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt: patch does not apply error: members/messaging.pl: does not exist in index error: patch failed: members/moremember.pl:442 error: members/moremember.pl: patch does not apply error: patch failed: members/notices.pl:55 error: members/notices.pl: patch does not apply Patch failed at 0001 Bug 6303: patron-title.inc to display properly title for borrowers of category_type 'I'
Created attachment 5820 [details] [review] patch
Created attachment 5836 [details] [review] [SIGNED-OFF] Bug 6303: Display Organisation and Parent Organisation names when viewing a borrower of type organistaion Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Works as advertised, doesn't affect display for non-organisational patrons. Note: Display change in OPAC only affects the summary tab. It would be a little bit more consistent to make the name show the same on all tabs in OPAC patron account.
Updating version : This ENH could be in Koha 3.8
Bug versionned for master. entries will be made against rel_3_8 once the patch has been applied (see thread about that on koha-devel yesterday)
This patch is already SIGNED but unfortunately does no longer apply. Please fix whitespace issues and rebase. /usr/share/koha/testclone/.git/rebase-apply/patch:56: trailing whitespace. # 'showname' which is the alternate form the user's first name if /usr/share/koha/testclone/.git/rebase-apply/patch:444: trailing whitespace. # in template <TMPL_IF name="I"> => instutitional (A for Adult, C for children) /usr/share/koha/testclone/.git/rebase-apply/patch:445: trailing whitespace. $template->param( $data->{'categorycode'} => 1 ); /usr/share/koha/testclone/.git/rebase-apply/patch:499: trailing whitespace. error: patch failed: circ/circulation.pl:629 error: circ/circulation.pl: patch does not apply error: patch failed: members/moremember.pl:439 error: members/moremember.pl: patch does not apply
Created attachment 6308 [details] [review] patch
Katrin, I compared the two diffs. It is just a minor rebase. Would you mind if I put your signoff back to this patch? In view of that I am setting status back to Signed. Feel free to undo if you disagree ;)
Hi Marcel, I trust your eye on this, if you want to pass it QA, please do. Thank you for asking.
Thanks for rebasing. Just found a few minor issues: warning: 4 lines add whitespace errors double line in opac-user.pl: patron_flagged => $borr->{flagged}, + Why do you add surname there, isn't it already in borrower_info? There a few places where you remove card number by the include patron-title, but patron-title does not bring back card number. Meaning we lose info here. Examples: circ-menu.inc, circulation.tt, moremember.tt, etc. (Look for card number) Could you please fix them too? Great!
(In reply to comment #15) > There a few places where you remove card number by the include patron-title, > but patron-title does not bring back card number. Meaning we lose info here. > Examples: circ-menu.inc, circulation.tt, moremember.tt, etc. (Look for card > number) Ignore this remark. It is present in patron-title!
Created attachment 6322 [details] [review] patch The doubled line came from a poor conflict resolution at rebasing, thanks for spotting
Lots of problems when applying this patch? The patron_flagged line still is double. 22 files changed now instead of 19. Did you start from a clean master or some other situation?
Created attachment 6334 [details] [review] patch Terribly sorry, that was an old patch
Created attachment 6366 [details] [review] Signed patch
QA Comment The patch applies with 4 whitespace warnings. No further comments now. Code looks good. Mostly template changes.
Small comment: in SQL, LEFT JOIN categories ON borrowers.categorycode=categories.categorycode can also be written LEFT JOIN categories USING(categorycode) when both fields have the same name and there can't be any ambiguity on the tables applicable (there can be some when multiple LEFT JOIN). I personnally prefer this syntax, that hilight more the field you join on. Patch pushed, please test
Note: Headings on patron account pages are not consistent in styling, this is not a problem introduced by this patch. The organisation name + other name is shown correctly on the first tab (summary).