Bugzilla – Attachment 58663 Details for
Bug 17855
New onboarding tool feature to guide users through setting up Koha, and minor web installer UI improvements
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 17855 - Similar to the previous patch
Bug-17855---Similar-to-the-previous-patch.patch (text/plain), 31.73 KB, created by
Alex Buckley
on 2017-01-08 23:28:12 UTC
(
hide
)
Description:
Bug 17855 - Similar to the previous patch
Filename:
MIME Type:
Creator:
Alex Buckley
Created:
2017-01-08 23:28:12 UTC
Size:
31.73 KB
patch
obsolete
>From 8560d873c2a96118e1bff0f6a8ae9ee69f27c522 Mon Sep 17 00:00:00 2001 >From: Alex Buckley <alexbuckley@catalyst.net.nz> >Date: Mon, 19 Dec 2016 20:34:49 +0000 >Subject: [PATCH] Bug 17855 - Similar to the previous patch > >Have fixed the incorrect insertion of patron into >the database > >Test plan: >1. Go through the web installer and onboarding tool >as outlined here: >https://koha-community.org/manual/installation/html/ > >2. Check the database to see that the library, patron >category, patron, and item type are now being inserted >successfully. > >bug 17855 - Similar to the previous patch, except >perl code to prevent card number duplication is >in the process of beign added to step 3 >in the onboarding.pl script. > >Same test plan as previous patch > >Bug 17855 - Similar to the >previous patch. > >Library, patron category, patron (with superlibrarian >permissions) and item type are all being inserted from >the onboarding.pl script into the database. > >Removed the error that was being displayed >after the first of the two create circulation rule >screens. > >Test plan >1. Run through the web installer and onboarding tool as outlined in: >https://koha-community.org/manual/installation/html/ > >2. Notice there is no error after the first of the two create >circulation rule screens. > >3. Check the database and you should see the library, patron category, >patron, and item type have been inserted. > >Bug 17855 - Refined text inputs to numerical inputs >in onboarding tool. > >Set minimum card number allowed to 1 for >creating a patron screen. In addition to displaying >patron category descriptions instead of codes >in the dropdown boxes of the aforementioned >screen. > >Implemented months and date check in the >create patron category screen. > >Bug 17855 - Similar to the previous >patch except for additional >perl code for step 5 (create circulation rule) >in the onboarding.pl script > >Months or dates check implemented in the create patron >category screen 1 > >Changed patron category codes to descriptions in create a new patron > >Trying to fix default_privacy error > >Updated text input fields to transform text to capitalize or >upper case as appropriate. > >Changed input fields to number rather than text where appropriate, minimum set to 0 > >Same as previous. Changed minimum to 1 for card number > >Working insertion of the item types >with working dropdown boxes in >the circulation rules screen > >Changed text to number input type > >Error no longer showing after the >first create circulation rule screen. The patron is also being inserted >to the database >correctly with the superlibrarian privilages. > >Working on preventing card number duplication > >fixed minor error where i was incorrectly inserted >--- > C4/Members.pm | 2 +- > installer/onboarding.pl | 96 +++++++-------- > .../intranet-tmpl/prog/en/includes/calendar.inc | 2 +- > .../prog/en/includes/installer-doc-head-close.inc | 15 +++ > .../prog/en/modules/onboarding/onboardingstep1.tt | 4 +- > .../prog/en/modules/onboarding/onboardingstep2.tt | 134 +++++++++++++-------- > .../prog/en/modules/onboarding/onboardingstep3.tt | 21 +--- > .../prog/en/modules/onboarding/onboardingstep4.tt | 6 +- > .../prog/en/modules/onboarding/onboardingstep5.tt | 12 +- > 9 files changed, 159 insertions(+), 133 deletions(-) > >diff --git a/C4/Members.pm b/C4/Members.pm >index dfe4cbd..a11cdb2 100644 >--- a/C4/Members.pm >+++ b/C4/Members.pm >@@ -498,7 +498,7 @@ sub AddMember { > } > > my $patron_category = $schema->resultset('Category')->find( $data{'categorycode'} ); >- $data{'privacy'} = >+ $data{'privacy'} = > $patron_category->default_privacy() eq 'default' ? 1 > : $patron_category->default_privacy() eq 'never' ? 2 > : $patron_category->default_privacy() eq 'forever' ? 0 >diff --git a/installer/onboarding.pl b/installer/onboarding.pl >index bea4e65..d5574d7 100755 >--- a/installer/onboarding.pl >+++ b/installer/onboarding.pl >@@ -184,7 +184,6 @@ if ( $start && $start eq 'Start setting up my Koha' ){ > debug => 1, > } > ); >- > > #Once the user submits the page, this code validates the input and adds it > #to the database as a new patron category >@@ -233,7 +232,6 @@ if ( $start && $start eq 'Start setting up my Koha' ){ > > #Create a patron > }elsif ( $step && $step == 3 ){ >- > my $libraries = Koha::Libraries->search( {}, { order_by => ['branchcode'] }, ); > $template->param(libraries => $libraries, > group_types => [ >@@ -252,11 +250,11 @@ if ( $start && $start eq 'Start setting up my Koha' ){ > categories => $categories, > ); > >- > my $input = new CGI; > my $op = $input->param('op') // 'list'; > >- my @messages; >+ my @messages; >+ my @errors; > > my ($template, $loggedinuser, $cookie)= get_template_and_user({ > template_name => "/onboarding/onboardingstep3.tt", >@@ -267,16 +265,8 @@ if ( $start && $start eq 'Start setting up my Koha' ){ > debug => 1, > }); > >- if($op eq 'add_form'){ >- my $member; >- $template->param( >- member => $member, >- ); >- } >- >- elsif($op eq 'add_validate'){ >- >- my %newdata; >+ if($op eq 'add_validate'){ >+ my %newdata; > > #Store the template form values in the newdata hash > $newdata{borrowernumber} = $input->param('borrowernumber'); >@@ -289,14 +279,26 @@ if ( $start && $start eq 'Start setting up my Koha' ){ > $newdata{password} = $input->param('password'); > $newdata{password2} = $input->param('password2'); > $newdata{dateexpiry} = '12/10/2016'; >+ $newdata{privacy} = "default"; >+ >+ if(my $error_code = checkcardnumber($newdata{cardnumber},$newdata{borrowernumber})){ >+ push @errors, $error_code == 1 >+ ? 'ERROR_cardnumber_already_exists' >+ :$error_code == 2 >+ ? 'ERROR_cardnumber_length' >+ :() >+ } >+ >+ > > #Hand the newdata hash to the AddMember subroutine in the C4::Members module and it creates a patron and hands back a borrowernumber which is being stored > my $borrowernumber = &AddMember(%newdata); >+ >+#Create a hash named member2 and fillit with the borrowernumber of the borrower that has just been created > my %member2; > $member2{'borrowernumber'}=$borrowernumber; > > my $flag = $input->param('flag'); >- > if ($input->param('newflags')) { > my $dbh=C4::Context->dbh(); > my @perms = $input->multi_param('flag'); >@@ -312,27 +314,28 @@ if ( $start && $start eq 'Start setting up my Koha' ){ > } > > >- # construct flags >- my $module_flags = 0; >- my $sth=$dbh->prepare("SELECT bit,flag FROM userflags ORDER BY bit"); >- $sth->execute(); >- while (my ($bit, $flag) = $sth->fetchrow_array) { >- if (exists $all_module_perms{$flag}) { >- $module_flags += 2**$bit; >- } >- } >+ # construct flags >+ my $module_flags = 0; >+ my $sth=$dbh->prepare("SELECT bit,flag FROM userflags ORDER BY bit"); >+ $sth->execute(); >+ while (my ($bit, $flag) = $sth->fetchrow_array) { >+ if (exists $all_module_perms{$flag}) { >+ $module_flags += 2**$bit; >+ } >+ } > >- $sth = $dbh->prepare("UPDATE borrowers SET flags=? WHERE borrowernumber=?"); >- $sth->execute($module_flags, $borrowernumber); >+ $sth = $dbh->prepare("UPDATE borrowers SET flags=? WHERE borrowernumber=?"); >+ $sth->execute($module_flags, $borrowernumber); > > >-#Error handling checking if the patron was created successfully >- if(!$borrowernumber){ >- push @messages, {type=> 'error', code => 'error_on_insert'}; >- }else{ >- push @messages, {type=> 'message', code => 'success_on_insert'}; >- } >- } >+ #Error handling checking if the patron was created successfully >+ if(!$borrowernumber){ >+ push @messages, {type=> 'error', code => 'error_on_insert'}; >+ }else{ >+ push @messages, {type=> 'message', code => 'success_on_insert'}; >+ } >+ } >+ } > }elsif ( $step && $step == 4){ > my $createitemtype = $input->param('createitemtype'); > $template->param('createitemtype'=> $createitemtype ); >@@ -360,14 +363,14 @@ if ( $start && $start eq 'Start setting up my Koha' ){ > my $description = $input->param('description'); > > #store the input from the form - only 2 fields >- my $itemtype= Koha::ItemType->new( >+ my $thisitemtype= Koha::ItemType->new( > { itemtype => $itemtype_code, > description => $description, > } > ); >- eval{ $itemtype->store; }; >+ eval{ $thisitemtype->store; }; > #Error messages >- if($itemtype){ >+ if($thisitemtype){ > $message = 'success_on_insert'; > }else{ > $message = 'error_on_insert'; >@@ -375,8 +378,10 @@ if ( $start && $start eq 'Start setting up my Koha' ){ > > $template->param('message' => $message); > } >- > }elsif ( $step && $step == 5){ >+ my $test="a"; >+ warn $test; >+ > #Fetching all the existing categories to display in a drop down box > my $categories; > $categories= Koha::Patron::Categories->search(); >@@ -403,14 +408,7 @@ if ( $start && $start eq 'Start setting up my Koha' ){ > my $type = $input->param('type'); > my $branch = $input->param('branch'); > >- >- >- if($op eq 'add_form'){ >- >- >- >- } >- elsif($op eq 'add_validate'){ >+ if($op eq 'add_validate'){ > my $bor = $input->param('categorycode'); > my $itemtype = $input->param('itemtype'); > my $maxissueqty = $input->param('maxissueqty'); >@@ -435,14 +433,10 @@ if ( $start && $start eq 'Start setting up my Koha' ){ > $issuingrule->set($params)->store(); > }else{ > Koha::IssuingRule->new()->set($params)->store(); >- } >+ } > } >+ } > >- my $createcirculationrule = $query->param('createcirculationrule'); >- $template->param('createcirculationrule'=>$createcirculationrule); >-} >- >-} > > output_html_with_http_headers $input, $cookie, $template->output; > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc >index f6d9e9b..a4bbe62 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc >@@ -6,7 +6,7 @@ var debug = "[% debug %]"; > var dformat = "[% dateformat %]"; > var sentmsg = 0; > if (debug > 1) {alert("dateformat: " + dformat + "\ndebug is on (level " + debug + ")");} >-var MSG_PLEASE_ENTER_A_VALID_DATE = _("Please enter a valid date (should match %s)."); >+var MSG_PLEASE_ENTER_A_VALID_DATE = (_("Please enter a valid date (should match %s).")); > > function is_valid_date(date) { > // An empty string is considered as a valid date for convenient reasons. >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc >index a4b435c..60d0e66 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc >@@ -1,5 +1,9 @@ > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/lib/jquery/jquery-ui-1.11.4.min.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/lib/bootstrap/bootstrap.min.css" /> >+<link rel="stylesheet" type="text/css" href="[% interface %]/lib/font-awesome/css/font-awesome.min.css" /> >+<link rel="stylesheet" type="text/css" media="print" href="[% interface %]/[% theme %]/css/print.css" /> > <style type="text/css" media="screen"> > > [% IF ( login ) %] >@@ -69,6 +73,17 @@ td input { font-size: 1.5em; } > > </style> > >+<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-2.2.3.min.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-migrate-1.3.0.min.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-ui-1.11.4.min.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/shortcut/shortcut.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.cookie.min.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.highlight-3.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/bootstrap/bootstrap.min.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.validate.min.js"></script> >+<!-- koha core js --> >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/staff-global.js"></script> >+ > <script type="text/javascript"> > //<![CDATA[ > function _(s) { return s } // dummy function for gettext >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt >index 07d0809..44c86ce 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt >@@ -87,12 +87,12 @@ > <ol> > <li> > <label for="branchcode" class="required">Library code: </label> >- <input type="text" name="branchcode" id="branchcode" size="10" maxlength="10" value="[% library.branchcode |html %]" class="required" required="required" /> >+ <input type="text" style="text-transform: uppercase;"name="branchcode" id="branchcode" size="10" maxlength="10" value="[% library.branchcode |html %]" class="required" required="required" /> > <span class="required">Required</span> > </li> > <li> > <label for="branchname" class="required">Name: </label> >- <input type="text" name="branchname" id="branchname" size="80" value="[% library.branchname |html %]" class=" required" required="required" style="width:200px;"> >+ <input type="text" style="text-transform:capitalize;" name="branchname" id="branchname" size="80" value="[% library.branchname |html %]" class=" required" required="required" style="width:200px;"> > <span class="required">Required</span> > </li> > </ol> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt >index 5808346..1635c68 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt >@@ -2,23 +2,84 @@ > [% USE Koha %] > [% USE KohaDates %] > [% USE Price %] >- > [% INCLUDE 'doc-head-open.inc' %] >+<title> Add a patron category</title> > [% INCLUDE 'installer-doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] >-[% INCLUDE 'datatables.inc' %] >- >- >-<head> >-<title> Add a patron category</title> >-<!--JQuery scripts for create patron category--> > <script type="text/javascript"> >- var MSG_CATEGORYCODE_CHARS = _("Category code can only contain the following characters: letters, numbers, - and _."); >- var MSG_BOTH_ENROLLMENTPERIODS = _("Please choose only one enrollment period setting."); >- var MSG_ONE_ENROLLMENTPERIOD = ("Please choose an enrollment period in months OR by date."); >+ var MSG_CATEGORYCODE_CHARS = (_("Category code can only contain the following characters: letters, numbers, - and _.")); >+ var MSG_ONE_ENROLLMENTPERIOD =(_("Please choose an enrollment period in months OR by date.")); >+</script> >+<script type="text/javascript"> >+jQuery.validator.addMethod( "letters_numbers", function(value,element){ >+ var patt = /^[a-zA-Z0-9\-_]+$/g; >+ if (patt.test(element.value)) { >+ return true; >+ } else { >+ return false; >+ } >+}, MSG_CATEGORYCODE_CHARS); >+ >+jQuery.validator.addMethod( "enrollment_period", function(){ >+ enrolmentperiod = $("#enrolmentperiod").val(); >+ enrolmentperioddate = $("#enrolmentperioddate").val(); >+ if ( $("#enrolmentperiod").val() !== "" && $("#enrolmentperioddate").val() !== "" ) { >+ return false; >+ } else { >+ return true; >+ } >+}, MSG_ONE_ENROLLMENTPERIOD); >+ >+$(document).ready(function(){ >+ $("#category_form").validate({ >+ rules: { >+ categorycode: { >+ required: true, >+ letters_numbers: true >+ }, >+ description: "required", >+ enrolmentperiod: { >+ required: function(element){ >+ return $("#enrolmentperioddate").val() === ""; >+ }, >+ digits: true, >+ enrollment_period: true >+ }, >+ enrolmentperioddate: { >+ required: function(element){ >+ return $("#enrolmentperiod").val() === ""; >+ }, >+ enrollment_period: true >+ }, >+ dateofbirthrequired: { >+ digits: true >+ }, >+ upperagelimit: { >+ digits: true >+ }, >+ enrolmentfee: { >+ number: true >+ }, >+ reservefee: { >+ number: true >+ }, >+ category_type: { >+ required: true >+ } >+ }, >+ messages: { >+ enrolmentperiod: { >+ required: MSG_ONE_ENROLLMENTPERIOD >+ }, >+ enrolmentperioddate: { >+ required: MSG_ONE_ENROLLMENTPERIOD >+ } >+ } >+ >+ }); >+ >+}) > </script> >-<script type="text/javascript" src="[% themelang %]/js/categories.js"></script> >-<style type="text/css">#enrolmentmessage.hint { display : none; }</style> > > </head> > >@@ -42,7 +103,6 @@ > [% ELSIF op == "add_validate" %] > [% IF message != "error_on_insert" %] > <form name="createcat" method="post" action="onboarding.pl"> >- Message is [%message%] > <input type="hidden" name="step" value="3"/> > <h1 align="left"> New patron category</h1> > <div> >@@ -67,21 +127,21 @@ > > > [% ELSE %] <!--Else display create patron category screen 1 where the user can input values to create their first patron category--> >- <h1 align="left"> Create a new Patron Category</h2> >- <form id="category_form" method="post" action="onboarding.pl"> >- <fieldset class="rows"> >+ <h1 align="left"> Create a new Patron Category</h1> >+ <form id="category_form" method="post" action="onboarding.pl"> >+ <fieldset class="rows"> > <input type="hidden" name="step" value="2"/> > <input type="hidden" name="op" value="add_validate" /> > <ol> > <li> > <label for="categorycode" class="required">Category code: </label> >- <input type="text" name="categorycode" value="[% category.categorycode |html %]" size="10" maxlength="10" class="required" required="required" /> >+ <input type="text" style="text-transform: uppercase;" name="categorycode" value="[% category.categorycode |html %]" size="10" maxlength="10" class="required" required="required" /> > <span class="required">Required</span> > </li> > > <li> > <label for="description" class="required">Description: </label> >- <input type="text" name="description" size="40" maxlength="80" class="required" required="required" value="[% category.description |html %]" /> >+ <input type="text" style="text-transform:capitalize;" name="description" size="40" maxlength="80" class="required" required="required" value="[% category.description |html %]" /> > <span class="required">Required</span> > </li> > >@@ -101,41 +161,11 @@ > <li> > <label for="category_type" class="required">Category type: </label> > <select name="category_type" value="category_type" class='required' required='required'> >- [% IF category and category.category_type == 'A' %] >- <option value="A" selected="selected">Adult</ option> >- [% ELSE %] >- <option value="A">Adult</option> >- [% END %] >- >- [% IF category and category.category_type == 'C' %] >- <option value="C" selected="selected">Child</ option> >- [% ELSE %] >- <option value="C">Child</option> >- [% END %] >- > [% IF category and category.category_type == 'S' %] > <option value="S" selected="selected">Staff</option> > [% ELSE %] > <option value="S">Staff</option> > [% END %] >- >- [% IF category and category.category_type == 'I' %] >- <option value="I" selected="selected">Organization</option> >- [% ELSE %] >- <option value="I">Organization</option> >- [% END %] >- >- [% IF category and category.category_type == 'P' %] >- <option value="P" selected="selected">Professional</option> >- [% ELSE %] >- <option value="P">Professional</option> >- [% END %] >- >- [% IF category and category.category_type == 'X' %] >- <option value="X" selected="selected">Statistical</option> >- [% ELSE %] >- <option value="X">Statistical</option> >- [% END %] > </select> > <span class="required">Required</span> > </li> >@@ -174,11 +204,11 @@ > <ol> > <li> > <label for="enrolmentperiod" style="width:6em;">In months: </label> >- <input type="text" name="enrolmentperiod" size="3" maxlength="1" value="[% IF category.enrolmentperiod %][% category.enrolmentperiod %][% END %]" /> months >+ <input type="number" min="0" class="enrollmentperiod" name="enrolmentperiod" size="3" maxlength="3" value="[% IF category.enrolmentperiod %][% category.enrolmentperiod %][% END %]" /> months > </li> > <li> > <label for="enrolmentperioddate" style="width:6em;">Until date: </label> >- <input type="text" name="enrolmentperioddate" value="[% category.enrolmentperioddate | $KohaDates %]" /> >+ <input type="text" class="enrollmentperiod" name="enrolmentperioddate" id="enrolmentperioddate" value="[% category.enrolmentperioddate | $KohaDates %]" /> > </li> > </ol> > </fieldset> >@@ -187,9 +217,7 @@ > </form> > [% END %] > >- >- >- >+[% INCLUDE 'intranet-bottom.inc' %] > > > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt >index e33b5bc..83667cb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt >@@ -54,12 +54,12 @@ > <li> > <label for="surname" class="required">Surname: </label> > >- <input type="text" id="surname" name="surname" value="[% surname %]" class="required" required="required" /> >+ <input type="text" style="text-transform:capitalize" id="surname" name="surname" value="[% surname %]" class="required" required="required" /> > <span class="required">Required</span> > </li> > <li> > <label for="firstname" class="required">First Name: </label> >- <input style= "text-transform:uppercase;" type="text" name="firstname" id="firstname" size="20" value="[% firstname |html %]" class="required" required="required"> >+ <input style= "text-transform:capitalize;" type="text" name="firstname" id="firstname" size="20" value="[% firstname |html %]" class="required" required="required"> > <span class="required">Required</span> > </li> > </ol> >@@ -68,7 +68,7 @@ > <ol> > <li> > <label for="cardnumber" class="required">Card Number: </label> >- <input type="text" id="cardnumber" name="cardnumber" size="10" maxlength="20" value="[% cardnumber | html %]" class="required"> >+ <input type="number" min="1" id="cardnumber" name="cardnumber" maxlength="20" value="[% borrower.cardnumber | html %]" class="required"> > <span class="required">Required</span> > </li> > <li> >@@ -87,7 +87,7 @@ > <label for="categorycode_entry" class="required"> Patron Category</label> > <select id="categorycode_entry" name="categorycode_entry" onchange="update_category_code(this);"> > [% FOREACH category IN categories %] >- <option name="categorycode_entry" value = "[% category.categorycode %]"> [%category.categorycode %]</option> >+ <option name="categorycode_entry" value = "[% category.categorycode %]"> [%category.description %]</option> > [% END %] > </select> > <span class="required">Required</span> >@@ -124,15 +124,4 @@ > </fieldset><br> > <input type="submit" class="action" value="Submit"/> > </form> >-[% END %] >- >- >- >- >- >- >- >- >- >- >- >+[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt >index 380488f..73400ff 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt >@@ -67,13 +67,13 @@ > <input type="hidden" name="op" value="add_validate" /> > <ol> > <li> >- <label for="itemtype" class="required">Item type: </label> >- <input type="text" name="itemtype" id="itemtype" size="10" maxlength="10" class="required" required="required" /> >+ <label for="itemtype" class="required">Item type code: </label> >+ <input type="text" style="text-transform:uppercase;" name="itemtype" id="itemtype" size="10" maxlength="10" class="required" required="required" /> > <span class="required">Required</span> > </li> > <li> > <label for="description" class="required">Description: </label> >- <input type="text" name="description" id="description" size="42" value="[% itemtype.description |html %]" class="required" required="required"> >+ <input type="text" style="text-transform:capitalize;" name="description" id="description" size="42" value="[% itemtype.description |html %]" class="required" required="required"> > <span class="required">Required</span> > </li> > </ol> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt >index 5d78334..f2a7ac8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt >@@ -57,9 +57,9 @@ > <li> > <label for="categorycode" class="required">Patron Category: </label> > <select name="categorycode" id="categorycode" required="required" onchange = "update_categorycode(this);"> >- >+ <!-- <option name="categorycode" value="All">All--> > [% FOREACH category IN categories %] >- <option name="categorycode" value = "[% category.description %]"> [%category.description %] >+ <option name="categorycode" value = "[% category.categorycode %]"> [%category.description %]</option> > [%END%] > </select> > <span class="required">Required</span> >@@ -77,13 +77,13 @@ > > <li> > <label for="maxissueqty" class="required">Current checkouts allowed: </label> >- <input type="text" name="maxissueqty" id="maxissueqty" size="10" maxlength="10" value="" class="required" required="required" /> >+ <input type="number" min="0" name="maxissueqty" id="maxissueqty" size="10" maxlength="10" value="" class="required" required="required" /> > <span class="required">Required</span> > </li> > > <li> > <label for="issuelength" class="required">Loan Period: </label> >- <input type="text" name="issuelength" id="issuelength" size="10" maxlength="10" value="" class="required" required="required" /> >+ <input type="number" min="0" name="issuelength" id="issuelength" size="10" maxlength="10" value="" class="required" required="required" /> > <span class="required">Required</span> > </li> > >@@ -109,13 +109,13 @@ > > <li> > <label for="renewalsallowed" class="required">Renewals Allowed: </label> >- <input type="text" name="renewalsallowed" id="renewalsallowed" size="10" maxlength="10" value="" class="required" required="required" /> >+ <input type="number"min="0" name="renewalsallowed" id="renewalsallowed" size="10" maxlength="10" value="" class="required" required="required" /> > <span class="required">Required</span> > </li> > > <li> > <label for="renewalperiod" class="required">Renewals Period: </label> >- <input type="text" name="renewalperiod" id="renewalperiod" size="10" maxlength="10" value="" class="required" required="required" /> >+ <input type="number" min="0"name="renewalperiod" id="renewalperiod" size="10" maxlength="10" value="" class="required" required="required" /> > <span class="required">Required</span> > </li> > >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 17855
:
58657
|
58658
|
58659
|
58660
|
58661
|
58662
|
58663
|
58664
|
58665
|
58666
|
58667
|
58668
|
58669
|
58781
|
58782
|
58783
|
58784
|
58785
|
58792
|
58793
|
58794
|
58846
|
58860
|
58861
|
58862
|
58886
|
58892
|
58893
|
58894
|
58895
|
58896
|
58897
|
58898
|
58899
|
58900
|
58901
|
58902
|
58903
|
58904
|
58905
|
58906
|
58907
|
59037
|
59051
|
59140
|
59141
|
59174
|
59188
|
59277
|
59279
|
59280
|
59281
|
59628
|
59703
|
59705
|
59706
|
59707
|
59708
|
59709
|
59710
|
59711
|
59712
|
59742
|
59826
|
59830
|
59840
|
59841
|
59842
|
59856
|
59857
|
60092
|
61667
|
61668
|
61986
|
62186
|
62191
|
62192
|
62193
|
62220
|
62221
|
62222
|
62223
|
62231
|
62233
|
62234
|
62235
|
62236
|
62237
|
62238
|
62239
|
62240
|
62241
|
62242
|
62243
|
62251
|
62252
|
62253
|
62254
|
62255
|
62256
|
62257
|
62258
|
62259
|
62260
|
62261
|
62262
|
62263
|
62281
|
62282
|
62283
|
62284
|
62285
|
62286
|
62287
|
62288
|
62668
|
62669
|
62670
|
62671
|
62672
|
62673
|
62674
|
62675