Attachment #140303 for bug #31028

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

Lines 2-8 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc (-1 / +4 lines)
2	[% INCLUDE 'blocking_errors.inc' %]	2	[% INCLUDE 'blocking_errors.inc' %]
3	<div id="toolbar" class="btn-toolbar">	3	<div id="toolbar" class="btn-toolbar">
4		4
5	[% IF ( CAN_user_editcatalogue_edit_catalogue \|\| CAN_user_editcatalogue_edit_items \|\| CAN_user_serials_create_subscription ) %]	5	[% IF ( CAN_user_editcatalogue_edit_catalogue \|\| CAN_user_editcatalogue_edit_items \|\| CAN_user_serials_create_subscription \|\| Koha.Preference('CatalogConcerns') ) %]
6	<div class="btn-group">	6	<div class="btn-group">
7	<button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button>	7	<button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button>
8	<ul class="dropdown-menu">	8	<ul class="dropdown-menu">
Lines 23-28 Link Here
23	[% IF CAN_user_editcatalogue_edit_catalogue && ! EasyAnalyticalRecords %]	23	[% IF CAN_user_editcatalogue_edit_catalogue && ! EasyAnalyticalRecords %]
24	<li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?parentbiblionumber=[% biblionumber \| uri %]">New child record</a></li>	24	<li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?parentbiblionumber=[% biblionumber \| uri %]">New child record</a></li>
25	[% END %]	25	[% END %]
		26	[% IF Koha.Preference('CatalogConcerns') %]
		27	<li><a id="newconcern" role="button" href="#" data-toggle="modal" data-target="#addConcernModal">New catalog concern</a></li>
		28	[% END %]
26	</ul>	29	</ul>
27	</div>	30	</div>
28	[% END %]	31	[% END %]




<!-- Add concern modal -->
<div class="modal" id="addConcernModal" tabindex="-1" role="dialog" aria-labelledby="addConcernLabel">
    <div class="modal-dialog" role="document">
        <div class="modal-content">
            <div class="modal-header">
                <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
                <h4 class="modal-title" id="addConcernLabel">Add concern</h4>
            </div>
            <div class="modal-body">
                <fieldset class="rows">
                    <ol>
                        [% IF biblionumber %]
                        <input type="hidden" id="biblio_add" name="biblio_id" value="[% biblionumber %]">
                        [% ELSE %]
                        <li>
                            <label class="required" for="biblio_id">Biblio: </label>
                            <input type="text" name="biblio_id" id="biblio_add">
                            <span class="required">Required</span>
                        </li>
                        [% END %]
                        <li>
                            <label class="required" for="message">Please describe your concern: </label>
                            <textarea id="message_add" name="message" required="required"></textarea>
                            <span class="required">Required</span>
                            <p id="helpBlock" class="help-block">A short summary of what the library policy is for dealing with such concerns and what constitutes a valid concern</p>
                        </li>
                    </ol>
                </fieldset>
            </div> <!-- /.modal-body -->
            <div class="modal-footer">
                <button type="submit" class="btn btn-default" id="addConfirm">Confirm</button>
                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
            </div> <!-- /.modal-footer -->
        </div> <!-- /.modal-content -->
    </div> <!-- /.modal-dialog -->
</div> <!-- /#addConcernModal -->

Lines 82-91 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt (+11 lines)
82	</div> <!-- /.col-sm-2.col-sm-pull-10 -->	82	</div> <!-- /.col-sm-2.col-sm-pull-10 -->
83	</div> <!-- /.row -->	83	</div> <!-- /.row -->
84		84
		85	[% IF ( Koha.Preference('CatalogConcerns') ) %]
		86	[% INCLUDE 'modals/add_catalog_concern.inc' %]
		87	[% END %]
		88
85	[% MACRO jsinclude BLOCK %]	89	[% MACRO jsinclude BLOCK %]
86	[% INCLUDE 'catalog-strings.inc' %]	90	[% INCLUDE 'catalog-strings.inc' %]
87	[% Asset.js("js/catalog.js") \| $raw %]	91	[% Asset.js("js/catalog.js") \| $raw %]
88	[% Asset.js("js/browser.js") \| $raw %]	92	[% Asset.js("js/browser.js") \| $raw %]
		93	[% IF ( Koha.Preference('CatalogConcerns') ) %]
		94	<script>
		95	/* Set a variable needed by add_catalog_concern.js */
		96	var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber \| html %]";
		97	</script>
		98	[% Asset.js("js/modals/add_catalog_concern.js") \| $raw %]
		99	[% END %]
89	<script>	100	<script>
90	var browser = KOHA.browser('[% searchid \| html %]', parseInt('[% biblionumber \| html %]', 10));	101	var browser = KOHA.browser('[% searchid \| html %]', parseInt('[% biblionumber \| html %]', 10));
91	browser.show();	102	browser.show();

Lines 206-216 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt (+10 lines)
206		206
207	[% END %]	207	[% END %]
208		208
		209	[% IF ( Koha.Preference('CatalogConcerns') ) %]
		210	[% INCLUDE 'modals/add_catalog_concern.inc' %]
		211	[% END %]
209		212
210	[% MACRO jsinclude BLOCK %]	213	[% MACRO jsinclude BLOCK %]
211	[% INCLUDE 'catalog-strings.inc' %]	214	[% INCLUDE 'catalog-strings.inc' %]
212	[% Asset.js("js/catalog.js") \| $raw %]	215	[% Asset.js("js/catalog.js") \| $raw %]
213	[% Asset.js("js/browser.js") \| $raw %]	216	[% Asset.js("js/browser.js") \| $raw %]
		217	[% IF ( Koha.Preference('CatalogConcerns') ) %]
		218	<script>
		219	/* Set a variable needed by add_catalog_concern.js */
		220	var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber \| html %]";
		221	</script>
		222	[% Asset.js("js/modals/add_catalog_concern.js") \| $raw %]
		223	[% END %]
214	<script>	224	<script>
215	var browser = KOHA.browser('[% searchid \| html %]', parseInt('[% biblionumber \| html %]', 10));	225	var browser = KOHA.browser('[% searchid \| html %]', parseInt('[% biblionumber \| html %]', 10));
216	browser.show();	226	browser.show();

Lines 1294-1305 Note that permanent location is a code, and location may be an authval. Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (+11 lines)
1294	</div>	1294	</div>
1295	[% END %]	1295	[% END %]
1296		1296
		1297	[% IF ( Koha.Preference('CatalogConcerns') ) %]
		1298	[% INCLUDE 'modals/add_catalog_concern.inc' %]
		1299	[% END %]
		1300
1297	[% MACRO jsinclude BLOCK %]	1301	[% MACRO jsinclude BLOCK %]
1298	[% INCLUDE 'catalog-strings.inc' %]	1302	[% INCLUDE 'catalog-strings.inc' %]
1299	[% Asset.js("js/catalog.js") \| $raw %]	1303	[% Asset.js("js/catalog.js") \| $raw %]
1300	[% Asset.js("js/recalls.js") \| $raw %]	1304	[% Asset.js("js/recalls.js") \| $raw %]
1301	[% Asset.js("js/coce.js") \| $raw %]	1305	[% Asset.js("js/coce.js") \| $raw %]
1302	[% Asset.js("lib/Chocolat/js/chocolat.js") \| $raw %]	1306	[% Asset.js("lib/Chocolat/js/chocolat.js") \| $raw %]
		1307	[% IF ( Koha.Preference('CatalogConcerns') ) %]
		1308	<script>
		1309	/* Set a variable needed by add_catalog_concern.js */
		1310	var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber \| html %]";
		1311	</script>
		1312	[% Asset.js("js/modals/add_catalog_concern.js") \| $raw %]
		1313	[% END %]
1303	<script>	1314	<script>
1304	var interface = "[% interface \| html %]";	1315	var interface = "[% interface \| html %]";
1305	var theme = "[% theme \| html %]";	1316	var theme = "[% theme \| html %]";

Lines 130-138 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt (+11 lines)
130	</div> <!-- /.col-sm-2.col-sm-pull-10 -->	130	</div> <!-- /.col-sm-2.col-sm-pull-10 -->
131	</div> <!-- /.row -->	131	</div> <!-- /.row -->
132		132
		133	[% IF ( Koha.Preference('CatalogConcerns') ) %]
		134	[% INCLUDE 'modals/add_catalog_concern.inc' %]
		135	[% END %]
		136
133	[% MACRO jsinclude BLOCK %]	137	[% MACRO jsinclude BLOCK %]
134	[% INCLUDE 'catalog-strings.inc' %]	138	[% INCLUDE 'catalog-strings.inc' %]
135	[% Asset.js("js/catalog.js") \| $raw %]	139	[% Asset.js("js/catalog.js") \| $raw %]
		140	[% IF ( Koha.Preference('CatalogConcerns') ) %]
		141	<script>
		142	/* Set a variable needed by add_catalog_concern.js */
		143	var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber \| html %]";
		144	</script>
		145	[% Asset.js("js/modals/add_catalog_concern.js") \| $raw %]
		146	[% END %]
136	<script>	147	<script>
137	var interface = "[% interface \| html %]";	148	var interface = "[% interface \| html %]";
138	var theme = "[% theme \| html %]";	149	var theme = "[% theme \| html %]";

Lines 92-101 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt (+11 lines)
92	</div> <!-- /.row -->	92	</div> <!-- /.row -->
93	[% END %]	93	[% END %]
94		94
		95	[% IF ( Koha.Preference('CatalogConcerns') ) %]
		96	[% INCLUDE 'modals/add_catalog_concern.inc' %]
		97	[% END %]
		98
95	[% MACRO jsinclude BLOCK %]	99	[% MACRO jsinclude BLOCK %]
96	[% INCLUDE 'catalog-strings.inc' %]	100	[% INCLUDE 'catalog-strings.inc' %]
97	[% Asset.js("js/catalog.js") \| $raw %]	101	[% Asset.js("js/catalog.js") \| $raw %]
98	[% Asset.js("js/browser.js") \| $raw %]	102	[% Asset.js("js/browser.js") \| $raw %]
		103	[% IF ( Koha.Preference('CatalogConcerns') ) %]
		104	<script>
		105	/* Set a variable needed by add_catalog_concern.js */
		106	var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber \| html %]";
		107	</script>
		108	[% Asset.js("js/modals/add_catalog_concern.js") \| $raw %]
		109	[% END %]
99	<script>	110	<script>
100	//<![CDATA[	111	//<![CDATA[
101	var browser = KOHA.browser('[% searchid \| html %]', parseInt('[% biblionumber \| html %]', 10));	112	var browser = KOHA.browser('[% searchid \| html %]', parseInt('[% biblionumber \| html %]', 10));

Lines 386-391 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt (+11 lines)
386	</div> <!-- /.col-sm-2.col-sm-pull-10 -->	386	</div> <!-- /.col-sm-2.col-sm-pull-10 -->
387	</div> <!-- /.row -->	387	</div> <!-- /.row -->
388		388
		389	[% IF ( Koha.Preference('CatalogConcerns') ) %]
		390	[% INCLUDE 'modals/add_catalog_concern.inc' %]
		391	[% END %]
		392
389	[% MACRO jsinclude BLOCK %]	393	[% MACRO jsinclude BLOCK %]
390	[% INCLUDE 'catalog-strings.inc' %]	394	[% INCLUDE 'catalog-strings.inc' %]
391	[% INCLUDE 'modals/checkout_renewals.inc' %]	395	[% INCLUDE 'modals/checkout_renewals.inc' %]
Lines 395-400 Link Here
395	[% Asset.js("js/catalog.js") \| $raw %]	399	[% Asset.js("js/catalog.js") \| $raw %]
396	[% Asset.js("js/browser.js") \| $raw %]	400	[% Asset.js("js/browser.js") \| $raw %]
397	[% Asset.js("js/checkout_renewals_modal.js") \| $raw %]	401	[% Asset.js("js/checkout_renewals_modal.js") \| $raw %]
		402	[% IF ( Koha.Preference('CatalogConcerns') ) %]
		403	<script>
		404	/* Set a variable needed by add_catalog_concern.js */
		405	var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber \| html %]";
		406	</script>
		407	[% Asset.js("js/modals/add_catalog_concern.js") \| $raw %]
		408	[% END %]
398	<script>	409	<script>
399	var browser = KOHA.browser('[% searchid \| html %]', parseInt('[% biblionumber \| html %]', 10));	410	var browser = KOHA.browser('[% searchid \| html %]', parseInt('[% biblionumber \| html %]', 10));
400	browser.show();	411	browser.show();




            </div> <!-- /.col-sm-2.col-sm-pull-10 -->
        </div> <!-- /.row -->

        [% INCLUDE 'modals/add_catalog_concern.inc' %]
        <div class="modal" id="addConcernModal" tabindex="-1" role="dialog" aria-labelledby="addConcernLabel">
            <div class="modal-dialog" role="document">
                <div class="modal-content">
                    <div class="modal-header">
                        <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
                        <h4 class="modal-title" id="addConcernLabel">Add concern</h4>
                    </div>
                    <div class="modal-body">
                        <fieldset class="rows">
                            <ol>
                                <li>
                                    <label class="required" for="biblio_id">Biblio: </label>
                                    <input type="text" name="biblio_id" id="biblio_add">
                                    <span class="required">Required</span>
                                </li>
                                <li>
                                    <label class="required" for="message">Please describe your concern: </label>
                                    <textarea id="message_add" name="message" required="required"></textarea>
                                    <span class="required">Required</span>
                                    <p id="helpBlock" class="help-block">A short summary of what the library policy is for dealing with such concerns and what constitutes a valid concern</p>
                                </li>
                            </ol>
                        </fieldset>
                    </div> <!-- /.modal-body -->
                    <div class="modal-footer">
                        <button type="submit" class="btn btn-default" id="addConfirm">Confirm</button>
                        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
                    </div> <!-- /.modal-footer -->
                </div> <!-- /.modal-content -->
            </div> <!-- /.modal-dialog -->
        </div> <!-- /#addConcernModal -->

        <!-- Resolve concern modal -->
        <div class="modal" id="resolveConcernModal" tabindex="-1" role="dialog" aria-labelledby="resolveConcernLabel">

    [% INCLUDE 'js-date-format.inc' %]
    [% INCLUDE 'js-patron-format.inc' %]
    [% INCLUDE 'js-biblio-format.inc' %]
    [% Asset.js("js/modals/add_catalog_concern.js") | $raw %]
    <script>
        $(document).ready(function() {


                    $("#concern_resolve_error").html(_("Error resolving concern #%s. Check the logs.").format(concern_id)).show();
                });
            });

            $('#addConcernModal').on('click', '#addConfirm', function(e) {
                let biblio_id = $('#biblio_add').val();
                let message = $('#message_add').val();

                params = {
                    message: message,
                    biblio_id: biblio_id,
                    reporter_id: logged_in_user_borrowernumber,
                };

                $.ajax({
                    url: '/api/v1/catalog/concerns',
                    type: 'POST',
                    data: JSON.stringify(params),
                    success: function(data) {
                        $('#AddConcernModal').modal('hide');

                        if ( $.fn.dataTable.isDataTable("#table_concerns") ) {
                            $("#table_concerns").DataTable().ajax.reload();
                        }
                    },
                    contentType: "json"
                });
            });
        });
    </script>
[% END %]

Lines 1347-1352 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +11 lines)
1347	</div> <!-- /#bundleMissingModal -->	1347	</div> <!-- /#bundleMissingModal -->
1348	[% END %]	1348	[% END %]
1349		1349
		1350	[% IF ( Koha.Preference('CatalogConcerns') ) %]
		1351	[% INCLUDE 'modals/add_catalog_concern.inc' %]
		1352	[% END %]
		1353
1350	[% MACRO jsinclude BLOCK %]	1354	[% MACRO jsinclude BLOCK %]
1351	[% INCLUDE 'datatables.inc' %]	1355	[% INCLUDE 'datatables.inc' %]
1352	[% INCLUDE 'columns_settings.inc' %]	1356	[% INCLUDE 'columns_settings.inc' %]
Lines 1359-1365 Link Here
1359	</script>	1363	</script>
1360	[% Asset.js("js/resolve_claim_modal.js") \| $raw %]	1364	[% Asset.js("js/resolve_claim_modal.js") \| $raw %]
1361	[% END %]	1365	[% END %]
1362		1366	[% IF ( Koha.Preference('CatalogConcerns') ) %]
		1367	<script>
		1368	/* Set a variable needed by add_catalog_concern.js */
		1369	var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber \| html %]";
		1370	</script>
		1371	[% Asset.js("js/modals/add_catalog_concern.js") \| $raw %]
		1372	[% END %]
1363	<script>	1373	<script>
1364	function Dopop(link) {	1374	function Dopop(link) {
1365	var newin = window.open(link, 'popup', 'width=600,height=400,resizable=1,toolbar=0,scrollbars=1,top');	1375	var newin = window.open(link, 'popup', 'width=600,height=400,resizable=1,toolbar=0,scrollbars=1,top');




$(document).ready(function() {
    $('#addConcernModal').on('click', '#addConfirm', function(e) {
        let biblio_id = $('#biblio_add').val();
        let message = $('#message_add').val();

        let params = {
            message: message,
            biblio_id: biblio_id,
            reporter_id: logged_in_user_borrowernumber,
        };

        $.ajax({
            url: '/api/v1/catalog/concerns',
            type: 'POST',
            data: JSON.stringify(params),
            success: function(data) {
                $('#addConcernModal').modal('hide');

                if ($.fn.dataTable.isDataTable("#table_concerns")) {
                    $("#table_concerns").DataTable().ajax.reload();
                }
            },
            contentType: "json"
        });
    });
});

Return to bug 31028

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/add_catalog_concern.inc (+36 lines)
	1	<!-- Add concern modal -->
	2	<div class="modal" id="addConcernModal" tabindex="-1" role="dialog" aria-labelledby="addConcernLabel">
	3	<div class="modal-dialog" role="document">
	4	<div class="modal-content">
	5	<div class="modal-header">
	6	<button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
	7	<h4 class="modal-title" id="addConcernLabel">Add concern</h4>
	8	</div>
	9	<div class="modal-body">
	10	<fieldset class="rows">
	11	<ol>
	12	[% IF biblionumber %]
	13	<input type="hidden" id="biblio_add" name="biblio_id" value="[% biblionumber %]">
	14	[% ELSE %]
	15	<li>
	16	<label class="required" for="biblio_id">Biblio: </label>
	17	<input type="text" name="biblio_id" id="biblio_add">
	18	<span class="required">Required</span>
	19	</li>
	20	[% END %]
	21	<li>
	22	<label class="required" for="message">Please describe your concern: </label>
	23	<textarea id="message_add" name="message" required="required"></textarea>
	24	<span class="required">Required</span>
	25	<p id="helpBlock" class="help-block">A short summary of what the library policy is for dealing with such concerns and what constitutes a valid concern</p>
	26	</li>
	27	</ol>
	28	</fieldset>
	29	</div> <!-- /.modal-body -->
	30	<div class="modal-footer">
	31	<button type="submit" class="btn btn-default" id="addConfirm">Confirm</button>
	32	<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
	33	</div> <!-- /.modal-footer -->
	34	</div> <!-- /.modal-content -->
	35	</div> <!-- /.modal-dialog -->
	36	</div> <!-- /#addConcernModal -->

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/modals/add_catalog_concern.js (-1 / +26 lines)
0	-	1	$(document).ready(function() {
		2	$('#addConcernModal').on('click', '#addConfirm', function(e) {
		3	let biblio_id = $('#biblio_add').val();
		4	let message = $('#message_add').val();
		5
		6	let params = {
		7	message: message,
		8	biblio_id: biblio_id,
		9	reporter_id: logged_in_user_borrowernumber,
		10	};
		11
		12	$.ajax({
		13	url: '/api/v1/catalog/concerns',
		14	type: 'POST',
		15	data: JSON.stringify(params),
		16	success: function(data) {
		17	$('#addConcernModal').modal('hide');
		18
		19	if ($.fn.dataTable.isDataTable("#table_concerns")) {
		20	$("#table_concerns").DataTable().ajax.reload();
		21	}
		22	},
		23	contentType: "json"
		24	});
		25	});
		26	});