Attachment 53913 Details for Bug 12446 – Bug 12446 - QA Follow-up

[patch] Bug 12446 - QA Follow-up

Bug-12446---QA-Follow-up.patch (text/plain), 7.61 KB, created by Mehdi Hamidi on 2016-08-02 14:41:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mehdi Hamidi

Created: 2016-08-02 14:41:46 UTC

Size: 7.61 KB

patch

obsolete

>From 2cae5a742f3f04bcc7674cb87dad06f6d42d45c5 Mon Sep 17 00:00:00 2001
>From: mehdi <mehdi@inlibro.com>
>Date: Tue, 2 Aug 2016 10:31:05 -0400
>Subject: [PATCH] Bug 12446 - QA Follow-up
>
>- Added missing icon on add gurantee
>- Removed category restriction when adding new guarentee
>- Put back some deleted entries while fixing merging conflicts.
>- Fixed some typing issues.
>---
> installer/data/mysql/kohastructure.sql                  |  1 +
> installer/data/mysql/sysprefs.sql                       |  2 +-
> .../intranet-tmpl/prog/en/includes/members-toolbar.inc  |  2 +-
> .../prog/en/modules/members/memberentrygen.tt           |  1 -
> koha-tmpl/intranet-tmpl/prog/js/members.js              |  8 ++++++++
> members/memberentry.pl                                  | 17 +++++------------
> 6 files changed, 16 insertions(+), 15 deletions(-)
>
>diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
>index 6204d87..7f64b7d 100644
>--- a/installer/data/mysql/kohastructure.sql
>+++ b/installer/data/mysql/kohastructure.sql
>@@ -319,6 +319,7 @@ CREATE TABLE `categories` ( -- this table shows information related to Koha patr
>   `category_type` varchar(1) NOT NULL default 'A', -- type of Koha patron (Adult, Child, Professional, Organizational, Statistical, Staff)
>   `BlockExpiredPatronOpacActions` tinyint(1) NOT NULL default '-1', -- wheither or not a patron of this category can renew books or place holds once their card has expired. 0 means they can, 1 means they cannot, -1 means use syspref BlockExpiredPatronOpacActions
>   `default_privacy` ENUM( 'default', 'never', 'forever' ) NOT NULL DEFAULT 'default', -- Default privacy setting for this patron category,
>+  `checkprevcheckout` varchar(7) NOT NULL default 'inherit', -- produce a warning for this patron category if this item has previously been checked out to this patron if 'yes', not if 'no', defer to syspref setting if 'inherit'.
>   `canbeguarantee` tinyint(1) NOT NULL default '0'
>   PRIMARY KEY  (`categorycode`),
>   UNIQUE KEY `categorycode` (`categorycode`)
>diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
>index 0c9433a..ead76ee 100644
>--- a/installer/data/mysql/sysprefs.sql
>+++ b/installer/data/mysql/sysprefs.sql
>@@ -546,5 +546,5 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('XSLTListsDisplay','default','','Enable XSLT stylesheet control over lists pages display on intranet','Free'),
> ('XSLTResultsDisplay','default','','Enable XSL stylesheet control over results page display on intranet','Free'),
> ('z3950AuthorAuthFields','701,702,700',NULL,'Define the MARC biblio fields for Personal Name Authorities to fill biblio.author','free'),
>-('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo'),
>+('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo')
> ;
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
>index 4731589..bbae9f3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
>@@ -148,7 +148,7 @@ function searchToHold(){
> 
>     [% IF ( CAN_user_borrowers ) %]
>         [% IF ( adultborrower AND activeBorrowerRelationship ) %]
>-            <a id="addchild" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=[% borrowernumber %]&amp;category_type=C"><i class="icon-plus"></i> Add guarantee</a>
>+            <a id="addchild" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=[% borrowernumber %]&amp;category_type=C"><i class="fa fa-plus"></i> Add guarantee</a>
>         [% END %]
>         [% IF ( CAN_user_borrowers ) %]
>             <a id="changepassword" class="btn btn-small" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]"><i class="fa fa-lock"></i> Change password</a>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>index 3a978e1..c13e704 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>@@ -1028,7 +1028,6 @@ $(document).ready(function() {
>                 <li data-category_code="[% patron_attribute.category_code %]">
>                     <label for="[% patron_attribute.form_id %]">[% patron_attribute.description %]: </label>
>                         <input type="hidden" id="[% patron_attribute.form_id %]_code" name="[% patron_attribute.form_id %]_code" value="[% patron_attribute.code |html %]" />
>-                        <input type="hidden" id="[% patron_attribute.form_id %]_desc" name="[% patron_attribute.form_id %]_desc" value="[% patron_attribute.description |html %]" />
>                         [% IF ( patron_attribute.use_dropdown ) %]
>                             <select id="[% patron_attribute.form_id %]" name="[% patron_attribute.form_id %]">
>                                 <option value=""></option>
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/members.js b/koha-tmpl/intranet-tmpl/prog/js/members.js
>index 9869621..5cc0f16 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/members.js
>+++ b/koha-tmpl/intranet-tmpl/prog/js/members.js
>@@ -347,4 +347,12 @@ $(document).ready(function(){
>         e.preventDefault();
>     });
>     $('#floating-save').css( { bottom: parseInt( $('#floating-save').css('bottom') ) + $('#changelanguage').height() + 'px' } );
>+    $('#qa-save').css( {
>+        bottom: parseInt( $('#qa-save').css('bottom') ) + $('#changelanguage').height() + 'px' ,
>+        "background-color": "rgba(185, 216, 217, 0.6)",
>+        "bottom": "3%",
>+        "position": "fixed",
>+        "right": "1%",
>+        "width": "150px",
>+    } );
> });
>diff --git a/members/memberentry.pl b/members/memberentry.pl
>index b4003f7..b038fd5 100755
>--- a/members/memberentry.pl
>+++ b/members/memberentry.pl
>@@ -238,7 +238,7 @@ if ( ( $op eq 'insert' ) and !$nodouble ) {
> }
> 
> #recover all data from guarantor address phone ,fax...
>-if ( $guarantorid and ( $category_type eq 'C' || $category_type eq 'P')) {
>+if ( $guarantorid) {
> 
>     if (my $guarantordata=GetMember(borrowernumber => $guarantorid)) {
>         $category_type = $guarantordata->{categorycode} eq 'I' ? 'P' : 'C';
>@@ -246,18 +246,11 @@ if ( $guarantorid and ( $category_type eq 'C' || $category_type eq 'P')) {
>         $newdata{'contactfirstname'}= $guarantordata->{'firstname'};
>         $newdata{'contactname'}     = $guarantordata->{'surname'};
>         $newdata{'contacttitle'}    = $guarantordata->{'title'};
>+
>         if ( $op eq 'add' ) {
>-	        foreach (qw(streetnumber address streettype address2
>-                        zipcode country city state phone phonepro mobile fax email emailpro branchcode
>-                        B_streetnumber B_streettype B_address B_address2
>-                        B_city B_state B_zipcode B_country B_email B_phone)) {
>-                        $newdata{$_} = $guarantordata->{$_};
>-	        }
>-            my $additionalGuarantorField=C4::Context->preference("AdditionalGuarantorField");
>-            my @field_add=split(/\|/,$additionalGuarantorField);
>-            my $guarantordata=GetMember(borrowernumber => $guarantorid);
>-            foreach (@field_add) {
>-                $newdata{$_} = $guarantordata->{$_};
>+            my @attributes = @{C4::Members::Attributes::get_guarantor_shared_attributes()};
>+            foreach my $attribute (@attributes) {
>+                $newdata{$attribute} = $guarantordata->{$attribute};
>             }
>         }
>     }
>-- 
>1.9.1

Actions: View | Diff | Splinter Review

Attachments on bug 12446: 29278 | 36176 | 39744 | 42469 | 42470 | 42535 | 46277 | 46278 | 46327 | 46328 | 46345 | 46486 | 49793 | 50953 | 53534 | 53535 | 53536 | 53913 | 60929 | 60930 | 60934 | 63148 | 63149 | 63214 | 64793 | 64794 | 64828 | 72295 | 72883 | 77766 | 77767 | 77768 | 79343 | 79344 | 79345 | 79347 | 79348 | 85069 | 88364 | 88365 | 88366 | 88367 | 90389 | 90390 | 90391 | 90392 | 90470 | 90471 | 90472 | 90473 | 93388 | 93389 | 93390 | 93391 | 93392 | 93393 | 93394 | 95411 | 95853 | 95854 | 95855 | 95856 | 95857 | 95858 | 95859 | 95860 | 106753 | 106754 | 106755 | 106756 | 106757 | 107611 | 111052 | 111053 | 111317 | 111318 | 112102 | 112160 | 112161 | 112162 | 112163 | 113583 | 121925 | 121926 | 121927 | 121928 | 121929 | 122084 | 122085 | 122086 | 122087 | 122088 | 122089 | 122090 | 122091 | 122184 | 122185 | 122186 | 122187 | 130398 | 130399 | 130400 | 130401 | 130402 | 131965 | 131966 | 131967 | 131968 | 131969 | 133691 | 133952 | 133953 | 133954 | 133955 | 133956 | 133957 | 134930 | 134931 | 134932 | 134933 | 134934 | 134935 | 134936 | 135506 | 135507 | 135508 | 135509 | 135510 | 135511 | 135512 | 135519 | 135520 | 135521 | 135522 | 135523 | 135544 | 135545 | 142401 | 142408 | 142431 | 142432 | 142433 | 142434 | 142435 | 142436 | 142437 | 142438 | 142439