From 4a3e952b26007f0703e1390d9e0445fc3daa611f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 6 Sep 2008 21:36:26 +0000
Subject: [PATCH] Agenda ical export allows to filter on login
---
htdocs/admin/agenda_xcal.php | 7 +++++++
htdocs/comm/action/index.php | 4 ++--
htdocs/comm/action/listactions.php | 4 ++--
htdocs/langs/en_US/agenda.lang | 5 +++++
htdocs/langs/fr_FR/agenda.lang | 5 +++++
5 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index 4a19849b964..1c9be6fef5c 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -121,6 +121,13 @@ $message.=$langs->trans("WebCalUrlForVCalExport",'ical',$urlical);
$message.='<br>';
$urlrss='<a href="'.DOL_URL_ROOT.'/comm/action/agendaexport.php?format=rss&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY):'...').'" target="_blank">'.$urlwithouturlroot.DOL_URL_ROOT.'/comm/action/agendaexport.php?format=rss&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY):'KEYNOTDEFINED').'</a>';
$message.=$langs->trans("WebCalUrlForVCalExport",'rss',$urlrss);
+$message.='<br>';
+$message.='<br>';
+$message.=$langs->trans("AgendaUrlOptions1",$user->login,$user->login).'<br>';
+$message.=$langs->trans("AgendaUrlOptions2",$user->login,$user->login).'<br>';
+$message.=$langs->trans("AgendaUrlOptions3",$user->login,$user->login).'<br>';
+$message.=$langs->trans("AgendaUrlOptions4",$user->login,$user->login).'<br>';
+$message.=$langs->trans("AgendaUrlOptions5",$user->login,$user->login);
print info_admin($message);
$db->close();
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 865d789ed72..ed1498ba72c 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -164,10 +164,10 @@ if ($canedit)
print $form->select_users($filtera,'userasked',1,'',!$canedit);
print '</td>';
print '<td rowspan="3" align="center" valign="middle" nowrap="nowrap">';
- print img_picto($langs->trans("ViewList"),'object_list').' <input type="submit" class="button" name="viewlist" value="'.$langs->trans("ViewList").'" '.($canedit?'':'disabled="true"') .'>';
+ print img_picto($langs->trans("ViewList"),'object_list').' <input type="submit" class="button" name="viewlist" value="'.$langs->trans("ViewList").'">';
print '<br>';
print '<br>';
- print img_picto($langs->trans("ViewCal"),'object_calendar').' <input type="submit" class="button" name="viewcal" value="'.$langs->trans("ViewCal").'" '.($canedit?'':'disabled="true"') .'>';
+ print img_picto($langs->trans("ViewCal"),'object_calendar').' <input type="submit" class="button" name="viewcal" value="'.$langs->trans("ViewCal").'" disabled="true">';
print '</td>';
print '</tr>';
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index c3fda3701b5..126ca63cf26 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -200,10 +200,10 @@ if ($resql)
print $form->select_users($filtera,'userasked',1,'',!$canedit);
print '</td>';
print '<td rowspan="3" align="center" valign="middle">';
- print img_picto($langs->trans("ViewList"),'object_list').' <input type="submit" class="button" name="viewlist" value="'.$langs->trans("ViewList").'" '.($canedit?'':'disabled="true"') .'>';
+ print img_picto($langs->trans("ViewList"),'object_list').' <input type="submit" class="button" name="viewlist" value="'.$langs->trans("ViewList").'" disabled="true">';
print '<br>';
print '<br>';
- print img_picto($langs->trans("ViewCal"),'object_calendar').' <input type="submit" class="button" name="viewcal" value="'.$langs->trans("ViewCal").'" '.($canedit?'':'disabled="true"') .'>';
+ print img_picto($langs->trans("ViewCal"),'object_calendar').' <input type="submit" class="button" name="viewcal" value="'.$langs->trans("ViewCal").'">';
print '</td>';
print '</tr>';
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index e9925458a37..1e8db697af5 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -36,3 +36,8 @@ DateActionDoneStart = Real start date
DateActionDoneEnd = Real end date
DateActionStart = Start date
DateActionEnd = End date
+AgendaUrlOptions1=You can also add following parameters to filter output:
+AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by, affected to or done by user <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions created by user <b>%s</b>.
+AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions affected to user <b>%s</b>.
+AgendaUrlOptions5=<b>logind=%s</b> to restrict output to actions done by user <b>%s</b>.
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index 14d5d69f7de..d023ba89763 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -36,3 +36,8 @@ DateActionDoneStart=Date d
DateActionDoneEnd=Date fin r�alisation r�elle
DateActionStart=Date d�but
DateActionEnd=Date fin
+AgendaUrlOptions1=Vous pouvez aussi ajouter les param�tres suivant pour filtrer les r�ponses:
+AgendaUrlOptions2=<b>login=%s</b> pour limiter l'export aux actions cr�es, affect�es ou r�alis�es par l'utilisateur <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> pour limiter l'export aux actions cr�es par l'utilisateur <b>%s</b>.
+AgendaUrlOptions4=<b>logint=%s</b> pour limiter l'export aux actions affect�es � l'utilisateur <b>%s</b>.
+AgendaUrlOptions5=<b>logind=%s</b> pour limiter l'export aux actions r�alis�es par l'utilisateur <b>%s</b>.
--
GitLab