Attachment #83858 for bug #17353

View | Details | Raw Unified | Return to bug 17353
Collapse All | Expand All

Lines 64-70 sub search { Link Here

(-)a/C4/Utils/DataTables/Members.pm (-1 / +1 lines)
64	borrowers.borrowernotes, borrowers.branchcode, borrowers.email,	64	borrowers.borrowernotes, borrowers.branchcode, borrowers.email,
65	borrowers.userid, borrowers.dateofbirth, borrowers.categorycode,	65	borrowers.userid, borrowers.dateofbirth, borrowers.categorycode,
66	categories.description AS category_description, categories.category_type,	66	categories.description AS category_description, categories.category_type,
67	branches.branchname";	67	branches.branchname, borrowers.phone";
68	my $from = "FROM borrowers	68	my $from = "FROM borrowers
69	LEFT JOIN branches ON borrowers.branchcode = branches.branchcode	69	LEFT JOIN branches ON borrowers.branchcode = branches.branchcode
70	LEFT JOIN categories ON borrowers.categorycode = categories.categorycode";	70	LEFT JOIN categories ON borrowers.categorycode = categories.categorycode";




          columnname: export
          cannot_be_toggled: 1
          cannot_be_modified: 1
      table_borrowers:
        -
          columnname: name
          cannot_be_toggled: 1
          cannot_be_modified: 1
        -
          columnname: cardnumber
        -
          columnname: date_of_birth
        -
          columnname: category
        -
          columnname: library
        -
          columnname: address
        -
          columnname: phone
          is_hidden: 1
    returns:
      checkedintable:
        -

Lines 9-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc (+2 lines)
9	<th>Category</th>	9	<th>Category</th>
10	<th>Library</th>	10	<th>Library</th>
11	<th>Address</th>	11	<th>Address</th>
		12	<th>Primary phone</th>
12	</tr>	13	</tr>
13	</thead>	14	</thead>
14	<tbody>	15	<tbody>
Lines 30-35 Link Here
30	<td>[% Categories.GetName( borrower.categorycode ) \| html %]</td>	31	<td>[% Categories.GetName( borrower.categorycode ) \| html %]</td>
31	<td>[% Branches.GetName( borrower.branchcode ) \| html %]</td>	32	<td>[% Branches.GetName( borrower.branchcode ) \| html %]</td>
32	<td>[% borrower.address \| html %]</td>	33	<td>[% borrower.address \| html %]</td>
		34	<td>[% borrower.phone \| html %]</td>
33	</tr>	35	</tr>
34	[% END %]	36	[% END %]
35	</tbody>	37	</tbody>

Lines 1005-1011 No patron matched <span class="ex">[% message \| html %]</span> Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-1 / +2 lines)
1005	var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");	1005	var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
1006	var MSG_CONFIRM_DELETE_MESSAGE = _("Are you sure you want to delete this message? This cannot be undone.");	1006	var MSG_CONFIRM_DELETE_MESSAGE = _("Are you sure you want to delete this message? This cannot be undone.");
1007		1007
1008	columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) \| $raw %]	1008	columns_settings_issues_table = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) \| $raw %]
		1009	columns_settings_borrowers_table = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'table_borrowers', 'json' ) \| $raw %]
1009		1010
1010	[% IF borrowernumber and patron %]	1011	[% IF borrowernumber and patron %]
1011	if($.cookie("holdfor") != [% patron.borrowernumber \| html %]){	1012	if($.cookie("holdfor") != [% patron.borrowernumber \| html %]){

Lines 546-552 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js (-1 / +1 lines)
546	.append(ul)	546	.append(ul)
547	.insertBefore(oSettings.nTableWrapper)	547	.insertBefore(oSettings.nTableWrapper)
548	},	548	},
549	}, columns_settings).rowGrouping(	549	}, columns_settings_issues_table).rowGrouping(
550	{	550	{
551	iGroupingColumnIndex: 1,	551	iGroupingColumnIndex: 1,
552	iGroupingOrderByColumnIndex: 0,	552	iGroupingOrderByColumnIndex: 0,

Lines 3-11 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/circ-patron-search-results.js (-7 / +8 lines)
3	$(".clickable").click(function() {	3	$(".clickable").click(function() {
4	window.document.location = $(this).data('url');	4	window.document.location = $(this).data('url');
5	});	5	});
6	var table = $("#table_borrowers").dataTable($.extend(true, {}, dataTablesDefaults, {	6	var table = KohaTable("table_borrowers",
7	"aaSorting": [ 0, "asc" ],	7	{
8	"sDom": "t",	8	"aaSorting": [ 0, "asc" ],
9	"iDisplayLength": -1	9	"sDom": "t",
10	}));	10	"iDisplayLength": -1
11	});	11	},
		12	columns_settings_borrowers_table, null);
		13	});
12	-

Return to bug 17353

Lines 566-572 modules: Link Here

(-)a/admin/columns_settings.yml (-1 / +18 lines)
566	columnname: export	566	columnname: export
567	cannot_be_toggled: 1	567	cannot_be_toggled: 1
568	cannot_be_modified: 1	568	cannot_be_modified: 1
569		569	table_borrowers:
		570	-
		571	columnname: name
		572	cannot_be_toggled: 1
		573	cannot_be_modified: 1
		574	-
		575	columnname: cardnumber
		576	-
		577	columnname: date_of_birth
		578	-
		579	columnname: category
		580	-
		581	columnname: library
		582	-
		583	columnname: address
		584	-
		585	columnname: phone
		586	is_hidden: 1
570	returns:	587	returns:
571	checkedintable:	588	checkedintable:
572	-	589	-