/[smecontribs]/rpms/smeserver-vacation/contribs9/smeserver-vacation-1.1.auto_enable_disable_vacation_userpanel.patch
ViewVC logotype

Contents of /rpms/smeserver-vacation/contribs9/smeserver-vacation-1.1.auto_enable_disable_vacation_userpanel.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (show annotations) (download)
Tue Jun 21 22:45:10 2016 UTC (8 years, 5 months ago) by stephdl
Branch: MAIN
CVS Tags: smeserver-vacation-1_1-22_el6_sme, smeserver-vacation-1_1-24_el6_sme, smeserver-vacation-1_1-21_el6_sme, smeserver-vacation-1_1-17_el6_sme, smeserver-vacation-1_1-20_el6_sme, smeserver-vacation-1_1-14_el6_sme, smeserver-vacation-1_1-26_el6_sme, smeserver-vacation-1_1-25_el6_sme, smeserver-vacation-1_1-16_el6_sme, smeserver-vacation-1_1-18_el6_sme, smeserver-vacation-1_1-19_el6_sme, smeserver-vacation-1_1-13_el6_sme, smeserver-vacation-1_1-15_el6_sme, smeserver-vacation-1_1-23_el6_sme, HEAD
Error occurred while calculating annotation data.
* Wed Jun 22 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 1.1-13.sme
- Add the automated and disabling user vacations on given date in the user panel.
- Add translation smeserver-vacation-1.1-locale-2016-06-21.patch

1 diff -Nur smeserver-vacation-1.1.old/root/etc/e-smith/web/functions/userpanel-vacation smeserver-vacation-1.1.new/root/etc/e-smith/web/functions/userpanel-vacation
2 --- smeserver-vacation-1.1.old/root/etc/e-smith/web/functions/userpanel-vacation 2013-11-13 11:39:48.000000000 +0100
3 +++ smeserver-vacation-1.1.new/root/etc/e-smith/web/functions/userpanel-vacation 2016-06-21 10:25:07.621311057 +0200
4 @@ -48,6 +48,14 @@
5 <label>USER_NAME</label>
6 </field>
7
8 + <field type="text" id="EmailVacationFrom" value="get_vacation_date_from()">
9 + <label>VACATION_FROM</label>
10 + </field>
11 +
12 + <field type="text" id="EmailVacationTo" value="get_vacation_date_to()">
13 + <label>VACATION_TO</label>
14 + </field>
15 +
16 <subroutine src="userpanel_get_vacation_text()" />
17
18 <field
19 diff -Nur smeserver-vacation-1.1.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/uservacations.pm smeserver-vacation-1.1.new/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/uservacations.pm
20 --- smeserver-vacation-1.1.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/uservacations.pm 2016-06-21 09:58:59.710887388 +0200
21 +++ smeserver-vacation-1.1.new/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/uservacations.pm 2016-06-21 10:26:48.588273957 +0200
22 @@ -343,6 +343,8 @@
23
24 my $EmailVacation = $q->param('EmailVacation');
25 my $new_message = $q->param('new_message');
26 + my $EmailVacationFrom = $q->param('EmailVacationFrom');
27 + my $EmailVacationTo = $q->param('EmailVacationTo');
28 my $vfile = "/home/e-smith/files/users/$user/.vacation.msg";
29
30 my $fullname = $adb->get_prop($user, "FirstName") . " " .
31 @@ -393,6 +395,8 @@
32 "/home/e-smith/files/users/$user/.vacation.msg");
33
34 $adb->set_prop($user, 'EmailVacation', $EmailVacation);
35 + $adb->set_prop($user, 'EmailVacationFrom', $EmailVacationFrom);
36 + $adb->set_prop($user, 'EmailVacationTo', $EmailVacationTo);
37
38 #the first is more correct but is slower
39 #system ("/sbin/e-smith/signal-event", "email-update", $user) == 0

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed