|
Description
Alex Buckley
2017-02-06 08:35:53 UTC
Created attachment 63224 [details] [review] Bug 18060 - Initial label onboarding tool Created attachment 63225 [details] [review] Bug 18060 - Initial label onboarding tool Created attachment 63228 [details] [review] Bug 18060 - Initial label onboarding tool with working retrieval of layouts and templates Created attachment 63229 [details] Bug 18060 - Initial label onboarding tool with working retrieval of layouts and templates Created attachment 63587 [details] Bug 18060 - Working label onboarding tool for creating a layout and a template Created attachment 63588 [details] Bug 18060 - Implemented redirect to label-edit-profile.pl after the user has created a template using the label onboarding tool Created attachment 63589 [details] Bug 18060 - Removed unused form in onboardinginclude3.inc Test plan: 1. Make sure the creator_layouts, creator_templates and printers_profile database tables are empty 2. In the Koha staff interface navigate to Tools->Label-creator 3. Notice that a blank screen appears 4. Apply patches attached to this bug report 5. Refresh the label-home.pl page 6. Notice a form to create a layout appears 7. Fill out this layout creation form and submit it 8. Notice another form also on label-home.pl appears to create a template 9. Fill out the template creation form and submit the form 10. Notice you are redirected to label-edit-profile.pl to create a printer profile 11. Test if the label onboarding tool forms are displaying appropriately by clicking on Manage->Label templates and delete the template you just created 12. Now go to label-home.pl and notice that the template creation form is displayed 13. Fill out the form and submit it 14. Notice you are not redirected to label-edit-profile.pl because you have already created a profile which has not been deleted instead a blank label-home.pl is displayed Created attachment 64733 [details] [review] Bug 18060 - Label onboarding tool to be displayed when no labels or templates exist The 18002 dependency applies cleanly (tested during this bug as well as tested 18002 independently as well). However, this bug does not apply. See merge conflict message below. Applying: Bug 18060 - Label onboarding tool to be displayed when no labels or templates exist Using index info to reconstruct a base tree... M C4/Budgets.pm M acqui/acqui-home.pl M admin/aqbudgetperiods.pl M admin/aqbudgets.pl M admin/currency.pl M koha-tmpl/intranet-tmpl/prog/css/staff-global.css M koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt M koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt M koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt <stdin>:749: new blank line at EOF. + warning: 1 line adds whitespace errors. Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude3.inc CONFLICT (add/add): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude3.inc Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude2.inc CONFLICT (add/add): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude2.inc Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude1.inc CONFLICT (add/add): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude1.inc Auto-merging koha-tmpl/intranet-tmpl/prog/css/staff-global.css CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/css/staff-global.css Failed to merge in the changes. Patch failed at 0001 Bug 18060 - Label onboarding tool to be displayed when no labels or templates exist 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-18060---Label-onboarding-tool-to-be-displayed--p4jDwr.patch Created attachment 64766 [details] [review] Bug 18060 - Label onboarding tool to be displayed when no labels or templates exist Updated to apply cleanly with bug 18002 Please follow the test plan on comment 8 Sorry, after applying the patch (on top of 18002, refresh memcahed and plack), I get an Internal error. Plack error log says: Variable "$layout" is not available at /home/marc/koha/labels/label-home.pl line 55. Can't call method "get_attr" on an undefined value at /home/marc/koha/labels/label-home.pl line 55. Created attachment 64951 [details] [review] Bug 18060: Followup solving $layout error Hi Marc Hopefully this attached followup patch solves the issue, it does on my machine Hi Alex, Sorry, but even after applying your followup 64951 patch the same plack error Marc points out still occurs for me. I tested it on a fresh kohadevbox Hi Alex, applied this on top of 18002. QA tools first: FAIL C4/Creators/Layout.pm OK critic OK forbidden patterns OK git manipulation OK pod FAIL pod coverage POD is missing for 'retrieve_all' OK spelling OK valid FAIL C4/Creators/Profile.pm OK critic OK forbidden patterns OK git manipulation OK pod FAIL pod coverage POD is missing for 'retrieve_all' OK spelling OK valid FAIL C4/Creators/Template.pm OK critic OK forbidden patterns OK git manipulation OK pod FAIL pod coverage POD is missing for get_next_label_pos POD is missing for retrieve_all OK spelling OK valid FAIL koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt OK forbidden patterns OK git manipulation FAIL spelling seperate ==> separate OK tt_valid OK valid_template Other files came back all green. Code review: didn't spot anything. Testing: When I try to access Tools > Label Creator I get an "internal server error". In the plack logs this translates to: Variable "$layout" is not available at /home/vagrant/kohaclone/labels/label-home.pl line 56. Can't call method "get_attr" on an undefined value at /home/vagrant/kohaclone/labels/label-home.pl line 56. Created attachment 67663 [details] [review] Bug 18060: Followup solving $layout error |