Attachment #97590 for bug #21296

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




    [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %]
    [% INCLUDE 'timepicker.inc' %]
    [% Asset.js("lib/jquery/plugins/jquery.dataTables.rowGrouping.js") | $raw %]
    <script>
    [% Asset.js("js/checkouts.js") | $raw %]
    [% Asset.js("js/holds.js") | $raw %]
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
    <script type="text/javascript">
        /* Set some variable needed in circulation.js */
        var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber | html %]";
        var ClaimReturnedLostValue = "[% Koha.Preference('ClaimReturnedLostValue') | html %]";


        var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
        var MSG_CONFIRM_DELETE_MESSAGE = _("Are you sure you want to delete this message? This cannot be undone.");
        var SuspendHoldsIntranet = [% ( Koha.Preference('SuspendHoldsIntranet') ) ? 1 : 0 | html %];
    </script>
    [% Asset.js("js/pages/circulation.js") | $raw %]
    [% Asset.js("js/checkouts.js") | $raw %]
    [% Asset.js("js/holds.js") | $raw %]
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
    <script>
        columns_settings_issues_table = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) | $raw %]
        columns_settings_borrowers_table = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %]





    [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %]
    [% INCLUDE 'timepicker.inc' %]
    [% Asset.js("lib/jquery/plugins/jquery.dataTables.rowGrouping.js") | $raw %]
    [% Asset.js("js/pages/circulation.js") | $raw %]
    [% Asset.js("js/checkouts.js") | $raw %]
    [% Asset.js("js/holds.js") | $raw %]
    [% INCLUDE 'str/members-menu.inc' %]
    [% Asset.js("js/members-menu.js") | $raw %]
    [% Asset.js("js/messaging-preference-form.js") | $raw %]
    <script>
        /* Set some variable needed in circulation.js */
        var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber | html %]";


        var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
        var MSG_CONFIRM_DELETE_MESSAGE = _("Are you sure you want to delete this message? This cannot be undone.");
        var SuspendHoldsIntranet = [% ( Koha.Preference('SuspendHoldsIntranet') ) ? 1 : 0 | html %];
    </script>
    [% Asset.js("js/pages/circulation.js") | $raw %]
    [% Asset.js("js/checkouts.js") | $raw %]
    [% Asset.js("js/holds.js") | $raw %]
    [% INCLUDE 'str/members-menu.inc' %]
    [% Asset.js("js/members-menu.js") | $raw %]
    [% Asset.js("js/messaging-preference-form.js") | $raw %]
    <script>

        columns_settings_issues_table = [% ColumnsSettings.GetColumns( 'members', 'moremember', 'issues-table', 'json' ) | $raw %]


Lines 122-127 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/holds.js (-1 / +1 lines)
122	},	122	},
123	{	123	{
124	"bSortable": false,	124	"bSortable": false,
		125	"visible": SuspendHoldsIntranet,
125	"mDataProp": function( oObj ) {	126	"mDataProp": function( oObj ) {
126	holds[oObj.reserve_id] = oObj; //Store holds for later use	127	holds[oObj.reserve_id] = oObj; //Store holds for later use
127		128
128	-

Return to bug 21296

Lines 1015-1025 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-6 / +8 lines)
1015	[% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") \| $raw %]	1015	[% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") \| $raw %]
1016	[% INCLUDE 'timepicker.inc' %]	1016	[% INCLUDE 'timepicker.inc' %]
1017	[% Asset.js("lib/jquery/plugins/jquery.dataTables.rowGrouping.js") \| $raw %]	1017	[% Asset.js("lib/jquery/plugins/jquery.dataTables.rowGrouping.js") \| $raw %]
1018	[% Asset.js("js/pages/circulation.js") \| $raw %]	1018	<script>
1019	[% Asset.js("js/checkouts.js") \| $raw %]
1020	[% Asset.js("js/holds.js") \| $raw %]
1021	[% Asset.js("js/circ-patron-search-results.js") \| $raw %]
1022	<script type="text/javascript">
1023	/* Set some variable needed in circulation.js */	1019	/* Set some variable needed in circulation.js */
1024	var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber \| html %]";	1020	var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber \| html %]";
1025	var ClaimReturnedLostValue = "[% Koha.Preference('ClaimReturnedLostValue') \| html %]";	1021	var ClaimReturnedLostValue = "[% Koha.Preference('ClaimReturnedLostValue') \| html %]";
Lines 1042-1048 Link Here
1042		1038
1043	var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");	1039	var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
1044	var MSG_CONFIRM_DELETE_MESSAGE = _("Are you sure you want to delete this message? This cannot be undone.");	1040	var MSG_CONFIRM_DELETE_MESSAGE = _("Are you sure you want to delete this message? This cannot be undone.");
1045		1041	var SuspendHoldsIntranet = [% ( Koha.Preference('SuspendHoldsIntranet') ) ? 1 : 0 \| html %];
		1042	</script>
		1043	[% Asset.js("js/pages/circulation.js") \| $raw %]
		1044	[% Asset.js("js/checkouts.js") \| $raw %]
		1045	[% Asset.js("js/holds.js") \| $raw %]
		1046	[% Asset.js("js/circ-patron-search-results.js") \| $raw %]
		1047	<script>
1046	columns_settings_issues_table = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) \| $raw %]	1048	columns_settings_issues_table = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) \| $raw %]
1047	columns_settings_borrowers_table = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'table_borrowers', 'json' ) \| $raw %]	1049	columns_settings_borrowers_table = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'table_borrowers', 'json' ) \| $raw %]
1048		1050

Lines 852-863 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-6 / +9 lines)
852	[% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") \| $raw %]	852	[% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") \| $raw %]
853	[% INCLUDE 'timepicker.inc' %]	853	[% INCLUDE 'timepicker.inc' %]
854	[% Asset.js("lib/jquery/plugins/jquery.dataTables.rowGrouping.js") \| $raw %]	854	[% Asset.js("lib/jquery/plugins/jquery.dataTables.rowGrouping.js") \| $raw %]
855	[% Asset.js("js/pages/circulation.js") \| $raw %]
856	[% Asset.js("js/checkouts.js") \| $raw %]
857	[% Asset.js("js/holds.js") \| $raw %]
858	[% INCLUDE 'str/members-menu.inc' %]
859	[% Asset.js("js/members-menu.js") \| $raw %]
860	[% Asset.js("js/messaging-preference-form.js") \| $raw %]
861	<script>	855	<script>
862	/* Set some variable needed in circulation.js */	856	/* Set some variable needed in circulation.js */
863	var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber \| html %]";	857	var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber \| html %]";
Lines 880-885 Link Here
880		874
881	var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");	875	var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
882	var MSG_CONFIRM_DELETE_MESSAGE = _("Are you sure you want to delete this message? This cannot be undone.");	876	var MSG_CONFIRM_DELETE_MESSAGE = _("Are you sure you want to delete this message? This cannot be undone.");
		877	var SuspendHoldsIntranet = [% ( Koha.Preference('SuspendHoldsIntranet') ) ? 1 : 0 \| html %];
		878	</script>
		879	[% Asset.js("js/pages/circulation.js") \| $raw %]
		880	[% Asset.js("js/checkouts.js") \| $raw %]
		881	[% Asset.js("js/holds.js") \| $raw %]
		882	[% INCLUDE 'str/members-menu.inc' %]
		883	[% Asset.js("js/members-menu.js") \| $raw %]
		884	[% Asset.js("js/messaging-preference-form.js") \| $raw %]
		885	<script>
883		886
884	columns_settings_issues_table = [% ColumnsSettings.GetColumns( 'members', 'moremember', 'issues-table', 'json' ) \| $raw %]	887	columns_settings_issues_table = [% ColumnsSettings.GetColumns( 'members', 'moremember', 'issues-table', 'json' ) \| $raw %]
885		888