The current data structure for Road Types is essentially the same as for Authorised Values, but it gets it's own admin page and database table. In an effort to simply both the Koha data structure, and the admin main page, I suggest moving this into Authorised Values. This development is marked as "(OUEST-PROVENCE)". Is there a reason for the separate table and admin page that I don't understand, (not being in a European library)?
Data layer: Step 1: create new authorised value ROADTYPE, both in default SQL and databaseupdate.pl Step 2: migrate existing roadtype table into new authorised value category using databaseupdate.pl Code layer: Step 3: replace usage of GetRoadTypes and GetRoadTypeDetails with GetAuthorisedValues(ROADTYPE) and GetKohaAuthorisedValueLib() respectively Step 4: remove administrative links to admin/roadtype.pl Cleanup: Step 5: remove admin/roadtype.pl page and corresponding template Step 6: remove GetRoadTypes and GetRoadTypeDetails subroutines from C4/Members.pm Step 7: remove roadtype table from DB and kohastructure.sql Documentation: Step 8: update documentation to reflect new mechanism for handling Road Types
Created attachment 22310 [details] [review] Bug 7372: Move road types from the roadtype table to the ROADTYPE AV Currently road types are stored in a specific table in DB. Moreover, an admin page is present in order to manage them. This patch proposes to remove this table and this page in favour of a new authorised value category 'ROADTYPE'. This patch: - adds a new AV category 'ROADTYPE' (created from the roadtype table content). - remove the roadtype table. - remove the .pl and .tt file admin/roadtype - remove the 2 routines C4::Members::GetRoadTypes and C4::Members::GetRoadTypeDetails Test plan: 1/ Execute the updatedatabase entry and verify existing roadtypes are now stored in the AV 'ROADTYPE'. 2/ Verify you can add/update a streettype for patrons. 3/ Verify on following pages the streettype is displayed in patron information (top left): circ/circulation.pl members/memberentry.pl members/moremember.pl members/routing-lists.pl
Applying: Bug 7372: Move road types from the roadtype table to the ROADTYPE AV Using index info to reconstruct a base tree... M installer/data/mysql/updatedatabase.pl Falling back to patching base and 3-way merge... Removing koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tt Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Removing admin/roadtype.pl Patch failed at 0001 Bug 7372: Move road types from the roadtype table to the ROADTYPE AV The copy of the patch that failed is found in: /home/christopher/git/koha/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".
Created attachment 22542 [details] [review] Bug 7372: Move road types from the roadtype table to the ROADTYPE AV Currently road types are stored in a specific table in DB. Moreover, an admin page is present in order to manage them. This patch proposes to remove this table and this page in favour of a new authorised value category 'ROADTYPE'. This patch: - adds a new AV category 'ROADTYPE' (created from the roadtype table content). - remove the roadtype table. - remove the .pl and .tt file admin/roadtype - remove the 2 routines C4::Members::GetRoadTypes and C4::Members::GetRoadTypeDetails Test plan: 1/ Execute the updatedatabase entry and verify existing roadtypes are now stored in the AV 'ROADTYPE'. 2/ Verify you can add/update a streettype for patrons. 3/ Verify on following pages the streettype is displayed in patron information (top left): circ/circulation.pl members/memberentry.pl members/moremember.pl members/routing-lists.pl
Created attachment 25212 [details] [review] Bug 7372: Move road types from the roadtype table to the ROADTYPE AV Currently road types are stored in a specific table in DB. Moreover, an admin page is present in order to manage them. This patch proposes to remove this table and this page in favour of a new authorised value category 'ROADTYPE'. This patch: - adds a new AV category 'ROADTYPE' (created from the roadtype table content). - remove the roadtype table. - remove the .pl and .tt file admin/roadtype - remove the 2 routines C4::Members::GetRoadTypes and C4::Members::GetRoadTypeDetails Test plan: 1/ Execute the updatedatabase entry and verify existing roadtypes are now stored in the AV 'ROADTYPE'. 2/ Verify you can add/update a streettype for patrons. 3/ Verify on following pages the streettype is displayed in patron information (top left): circ/circulation.pl members/memberentry.pl members/moremember.pl members/routing-lists.pl Signed-off-by: Sophie Meynieux <sophie.meynieux@biblibre.com>
Works as described in test plan
Created attachment 25540 [details] [review] Bug 7372: Move road types from the roadtype table to the ROADTYPE AV Currently road types are stored in a specific table in DB. Moreover, an admin page is present in order to manage them. This patch proposes to remove this table and this page in favour of a new authorised value category 'ROADTYPE'. This patch: - adds a new AV category 'ROADTYPE' (created from the roadtype table content). - remove the roadtype table. - remove the .pl and .tt file admin/roadtype - remove the 2 routines C4::Members::GetRoadTypes and C4::Members::GetRoadTypeDetails Test plan: 1/ Execute the updatedatabase entry and verify existing roadtypes are now stored in the AV 'ROADTYPE'. 2/ Verify you can add/update a streettype for patrons. 3/ Verify on following pages the streettype is displayed in patron information (top left): circ/circulation.pl members/memberentry.pl members/moremember.pl members/routing-lists.pl Signed-off-by: Sophie Meynieux <sophie.meynieux@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Passes koha-qa.pl, t and xt. Works as advertised.
Pushed to master. Thanks, Jonathan!
Pushed to 3.14.x, will be in 3.14.08
Created attachment 31526 [details] [review] Bug 7372: (follow-up) does execute this DB entry twice Since this enh has been backported on 3.14, this patch should be applied on 3.16 and master branch in order to update the updatedb entry. It should not be executed twice otherwise the process is stuck on this entry. http://irc.koha-community.org/koha/2014-09-11#i_1567078
ping 3.16 and master RM.
Followup pushed to master. Next time please fill a new bug report!
Created attachment 32083 [details] [review] Bug 7372: (follow-up) remove debug message
Tomas, Paul have found a debug message (in French...) in the last patch. Could you push it please?
Followup pushed to master, thanks Jonathan!
(In reply to Jonathan Druart from comment #11) > ping 3.16 and master RM. Followups pushed to 3.16.x, will be in 3.16.6