Attachment #109304 for bug #25776

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

Lines 1437-1442 modules: Link Here

(-)a/admin/columns_settings.yml (+2 lines)
1437	-	1437	-
1438	columnname: name	1438	columnname: name
1439	-	1439	-
		1440	columnname: updated_on
		1441	-
1440	columnname: copy_notice	1442	columnname: copy_notice
1441	-	1443	-
1442	columnname: actions	1444	columnname: actions

Lines 2487-2492 CREATE TABLE `letter` ( -- table for all notice templates in Koha Link Here

(-)a/installer/data/mysql/kohastructure.sql (+1 lines)
2487	`content` MEDIUMTEXT, -- body text for the notice or slip	2487	`content` MEDIUMTEXT, -- body text for the notice or slip
2488	`message_transport_type` varchar(20) NOT NULL DEFAULT 'email', -- transport type for this notice	2488	`message_transport_type` varchar(20) NOT NULL DEFAULT 'email', -- transport type for this notice
2489	`lang` varchar(25) NOT NULL DEFAULT 'default', -- lang of the notice	2489	`lang` varchar(25) NOT NULL DEFAULT 'default', -- lang of the notice
		2490	`updated_on` timestamp NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, -- last modification
2490	PRIMARY KEY (`module`,`code`, `branchcode`, `message_transport_type`, `lang`),	2491	PRIMARY KEY (`module`,`code`, `branchcode`, `message_transport_type`, `lang`),
2491	CONSTRAINT `message_transport_type_fk` FOREIGN KEY (`message_transport_type`)	2492	CONSTRAINT `message_transport_type_fk` FOREIGN KEY (`message_transport_type`)
2492	REFERENCES `message_transport_types` (`message_transport_type`) ON DELETE CASCADE ON UPDATE CASCADE	2493	REFERENCES `message_transport_types` (`message_transport_type`) ON DELETE CASCADE ON UPDATE CASCADE




[% USE raw %]
[% USE Asset %]
[% USE Koha %]
[% USE KohaDates %]
[% USE Branches %]
[% USE TablesSettings %]
[% SET footerjs = 1 %]

                                    <th>Module</th>
                                    <th>Code</th>
                                    <th>Name</th>
                                    <th class="title-string">Last updated</th>
                                    <th class="nosort">Copy notice</th>
                                    <th class="nosort">Actions</th>
                                </tr>

                                        </td>
                                        <td>[% lette.code | html %]</td>
                                        <td>[% lette.name | html %]</td>
                                        <td>[% lette.updated_on | $KohaDates with_hours = 1 %]</td>
                                        <td class="actions">
                                            [% IF !independant_branch || !lette.branchcode %]
                                                <form method="post" action="/cgi-bin/koha/tools/letter.pl">

                                    [% END %]
                                        <ol>
                                            <li>
                                                <label for="updated_on_[% letter.message_transport_type | html %]_[% lang | html %]">Last updated:</label>
                                                [% letter.updated_on | $KohaDates with_hours = 1 %]
                                            </li>
                                            <li>
                                                <input type="hidden" name="message_transport_type" value="[% letter.message_transport_type | html %]" />
                                                <input type="hidden" name="lang" value="[% lang | html %]" />
                                                <label for="is_html_[% letter.message_transport_type | html %]_[% lang | html %]">HTML message:</label>

Lines 208-213 sub add_form { Link Here

(-)a/tools/letter.pl (-2 / +2 lines)
208	$letters{ $lang }{templates}{$mtt} = {	208	$letters{ $lang }{templates}{$mtt} = {
209	message_transport_type => $letter->{message_transport_type},	209	message_transport_type => $letter->{message_transport_type},
210	is_html => $letter->{is_html},	210	is_html => $letter->{is_html},
		211	updated_on => $letter->{updated_on},
211	title => $letter->{title},	212	title => $letter->{title},
212	content => $letter->{content} // '',	213	content => $letter->{content} // '',
213	};	214	};
Lines 368-374 sub retrieve_letters { Link Here
368		369
369	my $dbh = C4::Context->dbh;	370	my $dbh = C4::Context->dbh;
370	my ($sql, @where, @args);	371	my ($sql, @where, @args);
371	$sql = "SELECT branchcode, module, code, name, branchname	372	$sql = "SELECT branchcode, module, code, name, branchname, MAX(updated_on) as updated_on
372	FROM letter	373	FROM letter
373	LEFT OUTER JOIN branches USING (branchcode)	374	LEFT OUTER JOIN branches USING (branchcode)
374	";	375	";
375	-

Return to bug 25776

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt (+7 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE Koha %]	3	[% USE Koha %]
		4	[% USE KohaDates %]
4	[% USE Branches %]	5	[% USE Branches %]
5	[% USE TablesSettings %]	6	[% USE TablesSettings %]
6	[% SET footerjs = 1 %]	7	[% SET footerjs = 1 %]
Lines 142-147 Link Here
142	<th>Module</th>	143	<th>Module</th>
143	<th>Code</th>	144	<th>Code</th>
144	<th>Name</th>	145	<th>Name</th>
		146	<th class="title-string">Last updated</th>
145	<th class="nosort">Copy notice</th>	147	<th class="nosort">Copy notice</th>
146	<th class="nosort">Actions</th>	148	<th class="nosort">Actions</th>
147	</tr>	149	</tr>
Lines 175-180 Link Here
175	</td>	177	</td>
176	<td>[% lette.code \| html %]</td>	178	<td>[% lette.code \| html %]</td>
177	<td>[% lette.name \| html %]</td>	179	<td>[% lette.name \| html %]</td>
		180	<td>[% lette.updated_on \| $KohaDates with_hours = 1 %]</td>
178	<td class="actions">	181	<td class="actions">
179	[% IF !independant_branch \|\| !lette.branchcode %]	182	[% IF !independant_branch \|\| !lette.branchcode %]
180	<form method="post" action="/cgi-bin/koha/tools/letter.pl">	183	<form method="post" action="/cgi-bin/koha/tools/letter.pl">
Lines 418-423 Link Here
418	[% END %]	421	[% END %]
419	<ol>	422	<ol>
420	<li>	423	<li>
		424	<label for="updated_on_[% letter.message_transport_type \| html %]_[% lang \| html %]">Last updated:</label>
		425	[% letter.updated_on \| $KohaDates with_hours = 1 %]
		426	</li>
		427	<li>
421	<input type="hidden" name="message_transport_type" value="[% letter.message_transport_type \| html %]" />	428	<input type="hidden" name="message_transport_type" value="[% letter.message_transport_type \| html %]" />
422	<input type="hidden" name="lang" value="[% lang \| html %]" />	429	<input type="hidden" name="lang" value="[% lang \| html %]" />
423	<label for="is_html_[% letter.message_transport_type \| html %]_[% lang \| html %]">HTML message:</label>	430	<label for="is_html_[% letter.message_transport_type \| html %]_[% lang \| html %]">HTML message:</label>