Standardize page name
This commit is contained in:
parent
19d0283b63
commit
c527189088
@ -168,7 +168,7 @@ if ($object->id > 0)
|
|||||||
$filters=array();
|
$filters=array();
|
||||||
$filters['search_agenda_label']=$search_agenda_label;
|
$filters['search_agenda_label']=$search_agenda_label;
|
||||||
|
|
||||||
// TODO Replace this with same code than into listactions.php
|
// TODO Replace this with same code than into list.php
|
||||||
show_actions_done($conf,$langs,$db,$object,null,0,$actioncode, '', $filters, $sortfield, $sortorder);
|
show_actions_done($conf,$langs,$db,$object,null,0,$actioncode, '', $filters, $sortfield, $sortorder);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1198,7 +1198,7 @@ if ($id > 0)
|
|||||||
}
|
}
|
||||||
|
|
||||||
$linkback =img_picto($langs->trans("BackToList"),'object_list','class="hideonsmartphone pictoactionview"');
|
$linkback =img_picto($langs->trans("BackToList"),'object_list','class="hideonsmartphone pictoactionview"');
|
||||||
$linkback.= '<a href="'.DOL_URL_ROOT.'/comm/action/listactions.php">'.$langs->trans("BackToList").'</a>';
|
$linkback.= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php">'.$langs->trans("BackToList").'</a>';
|
||||||
|
|
||||||
// Link to other agenda views
|
// Link to other agenda views
|
||||||
$out='';
|
$out='';
|
||||||
|
|||||||
@ -943,7 +943,7 @@ class ActionComm extends CommonObject
|
|||||||
$response = new WorkboardResponse();
|
$response = new WorkboardResponse();
|
||||||
$response->warning_delay = $conf->agenda->warning_delay/60/60/24;
|
$response->warning_delay = $conf->agenda->warning_delay/60/60/24;
|
||||||
$response->label = $langs->trans("ActionsToDo");
|
$response->label = $langs->trans("ActionsToDo");
|
||||||
$response->url = DOL_URL_ROOT.'/comm/action/listactions.php?status=todo&mainmenu=agenda';
|
$response->url = DOL_URL_ROOT.'/comm/action/list.php?status=todo&mainmenu=agenda';
|
||||||
if ($user->rights->agenda->allactions->read) $response->url.='&filtert=-1';
|
if ($user->rights->agenda->allactions->read) $response->url.='&filtert=-1';
|
||||||
$response->img = img_object('',"action",'class="inline-block valigntextmiddle"');
|
$response->img = img_object('',"action",'class="inline-block valigntextmiddle"');
|
||||||
}
|
}
|
||||||
|
|||||||
@ -124,7 +124,7 @@ if ($object->id > 0)
|
|||||||
dol_fiche_head($head, 'documents', $langs->trans("Action"), -1, 'action');
|
dol_fiche_head($head, 'documents', $langs->trans("Action"), -1, 'action');
|
||||||
|
|
||||||
$linkback = img_picto($langs->trans("BackToList"),'object_list','class="hideonsmartphone pictoactionview"');
|
$linkback = img_picto($langs->trans("BackToList"),'object_list','class="hideonsmartphone pictoactionview"');
|
||||||
$linkback.= '<a href="'.DOL_URL_ROOT.'/comm/action/listactions.php">'.$langs->trans("BackToList").'</a>';
|
$linkback.= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php">'.$langs->trans("BackToList").'</a>';
|
||||||
|
|
||||||
// Link to other agenda views
|
// Link to other agenda views
|
||||||
$out='';
|
$out='';
|
||||||
|
|||||||
@ -138,7 +138,7 @@ if (GETPOST("viewlist") || $action == 'show_list')
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
//print $param;
|
//print $param;
|
||||||
header("Location: ".DOL_URL_ROOT.'/comm/action/listactions.php?'.$param);
|
header("Location: ".DOL_URL_ROOT.'/comm/action/list.php?'.$param);
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/comm/action/listactions.php
|
* \file htdocs/comm/action/list.php
|
||||||
* \ingroup agenda
|
* \ingroup agenda
|
||||||
* \brief Page to list actions
|
* \brief Page to list actions
|
||||||
*/
|
*/
|
||||||
@ -336,7 +336,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
|
|||||||
$sql.= $db->plimit($limit + 1, $offset);
|
$sql.= $db->plimit($limit + 1, $offset);
|
||||||
//print $sql;
|
//print $sql;
|
||||||
|
|
||||||
dol_syslog("comm/action/listactions.php", LOG_DEBUG);
|
dol_syslog("comm/action/list.php", LOG_DEBUG);
|
||||||
$resql=$db->query($sql);
|
$resql=$db->query($sql);
|
||||||
if ($resql)
|
if ($resql)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -724,7 +724,7 @@ jQuery(document).ready(function() {
|
|||||||
else if (ids.indexOf(",") > -1) /* There is several events */
|
else if (ids.indexOf(",") > -1) /* There is several events */
|
||||||
{
|
{
|
||||||
/* alert(\'several events\'); */
|
/* alert(\'several events\'); */
|
||||||
url = "'.DOL_URL_ROOT.'/comm/action/listactions.php?filtert="+userid+"&dateselectyear="+year+"&dateselectmonth="+month+"&dateselectday="+day;
|
url = "'.DOL_URL_ROOT.'/comm/action/list.php?filtert="+userid+"&dateselectyear="+year+"&dateselectmonth="+month+"&dateselectday="+day;
|
||||||
window.location.href = url;
|
window.location.href = url;
|
||||||
}
|
}
|
||||||
else /* One event */
|
else /* One event */
|
||||||
|
|||||||
@ -839,7 +839,7 @@ jQuery(document).ready(function() {
|
|||||||
else if (ids.indexOf(",") > -1) /* There is several events */
|
else if (ids.indexOf(",") > -1) /* There is several events */
|
||||||
{
|
{
|
||||||
/* alert(\'several events\'); */
|
/* alert(\'several events\'); */
|
||||||
url = "'.DOL_URL_ROOT.'/comm/action/listactions.php?filtert="+userid+"&dateselectyear="+year+"&dateselectmonth="+month+"&dateselectday="+day;
|
url = "'.DOL_URL_ROOT.'/comm/action/list.php?filtert="+userid+"&dateselectyear="+year+"&dateselectmonth="+month+"&dateselectday="+day;
|
||||||
window.location.href = url;
|
window.location.href = url;
|
||||||
}
|
}
|
||||||
else /* One event */
|
else /* One event */
|
||||||
|
|||||||
@ -239,7 +239,7 @@ function show_array_actions_to_do($max=5)
|
|||||||
|
|
||||||
print '<table class="noborder" width="100%">';
|
print '<table class="noborder" width="100%">';
|
||||||
print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastActionsToDo",$max).'</th>';
|
print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastActionsToDo",$max).'</th>';
|
||||||
print '<th colspan="2" align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/listactions.php?status=todo">'.$langs->trans("FullList").'</a></th>';
|
print '<th colspan="2" align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/list.php?status=todo">'.$langs->trans("FullList").'</a></th>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
$var = true;
|
$var = true;
|
||||||
@ -336,7 +336,7 @@ function show_array_last_actions_done($max=5)
|
|||||||
|
|
||||||
print '<table class="noborder" width="100%">';
|
print '<table class="noborder" width="100%">';
|
||||||
print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastDoneTasks",$max).'</th>';
|
print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastDoneTasks",$max).'</th>';
|
||||||
print '<th colspan="2" align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/listactions.php?status=done">'.$langs->trans("FullList").'</a></th>';
|
print '<th colspan="2" align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/list.php?status=done">'.$langs->trans("FullList").'</a></th>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
$var = true;
|
$var = true;
|
||||||
$i = 0;
|
$i = 0;
|
||||||
@ -514,7 +514,7 @@ function calendars_prepare_head($param)
|
|||||||
$h = 0;
|
$h = 0;
|
||||||
$head = array();
|
$head = array();
|
||||||
|
|
||||||
$head[$h][0] = DOL_URL_ROOT.'/comm/action/listactions.php'.($param?'?'.$param:'');
|
$head[$h][0] = DOL_URL_ROOT.'/comm/action/list.php'.($param?'?'.$param:'');
|
||||||
$head[$h][1] = $langs->trans("ViewList");
|
$head[$h][1] = $langs->trans("ViewList");
|
||||||
$head[$h][2] = 'cardlist';
|
$head[$h][2] = 'cardlist';
|
||||||
$h++;
|
$h++;
|
||||||
|
|||||||
@ -1355,7 +1355,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
|
|||||||
if ($donetodo)
|
if ($donetodo)
|
||||||
{
|
{
|
||||||
$tmp='';
|
$tmp='';
|
||||||
if (get_class($filterobj) == 'Societe') $tmp.='<a href="'.DOL_URL_ROOT.'/comm/action/listactions.php?socid='.$filterobj->id.'&status=done">';
|
if (get_class($filterobj) == 'Societe') $tmp.='<a href="'.DOL_URL_ROOT.'/comm/action/list.php?socid='.$filterobj->id.'&status=done">';
|
||||||
$tmp.=($donetodo != 'done' ? $langs->trans("ActionsToDoShort") : '');
|
$tmp.=($donetodo != 'done' ? $langs->trans("ActionsToDoShort") : '');
|
||||||
$tmp.=($donetodo != 'done' && $donetodo != 'todo' ? ' / ' : '');
|
$tmp.=($donetodo != 'done' && $donetodo != 'todo' ? ' / ' : '');
|
||||||
$tmp.=($donetodo != 'todo' ? $langs->trans("ActionsDoneShort") : '');
|
$tmp.=($donetodo != 'todo' ? $langs->trans("ActionsDoneShort") : '');
|
||||||
|
|||||||
@ -302,7 +302,7 @@ class modAgenda extends DolibarrModules
|
|||||||
'type'=>'left',
|
'type'=>'left',
|
||||||
'titre'=>'List',
|
'titre'=>'List',
|
||||||
'mainmenu'=>'agenda',
|
'mainmenu'=>'agenda',
|
||||||
'url'=>'/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda',
|
'url'=>'/comm/action/list.php?mainmenu=agenda&leftmenu=agenda',
|
||||||
'langs'=>'agenda',
|
'langs'=>'agenda',
|
||||||
'position'=>110,
|
'position'=>110,
|
||||||
'perms'=>'$user->rights->agenda->myactions->read',
|
'perms'=>'$user->rights->agenda->myactions->read',
|
||||||
@ -314,7 +314,7 @@ class modAgenda extends DolibarrModules
|
|||||||
'type'=>'left',
|
'type'=>'left',
|
||||||
'titre'=>'MenuToDoMyActions',
|
'titre'=>'MenuToDoMyActions',
|
||||||
'mainmenu'=>'agenda',
|
'mainmenu'=>'agenda',
|
||||||
'url'=>'/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine',
|
'url'=>'/comm/action/list.php?mainmenu=agenda&leftmenu=agenda&status=todo&filter=mine',
|
||||||
'langs'=>'agenda',
|
'langs'=>'agenda',
|
||||||
'position'=>111,
|
'position'=>111,
|
||||||
'perms'=>'$user->rights->agenda->myactions->read',
|
'perms'=>'$user->rights->agenda->myactions->read',
|
||||||
@ -326,7 +326,7 @@ class modAgenda extends DolibarrModules
|
|||||||
'type'=>'left',
|
'type'=>'left',
|
||||||
'titre'=>'MenuDoneMyActions',
|
'titre'=>'MenuDoneMyActions',
|
||||||
'mainmenu'=>'agenda',
|
'mainmenu'=>'agenda',
|
||||||
'url'=>'/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=done&filter=mine',
|
'url'=>'/comm/action/list.php?mainmenu=agenda&leftmenu=agenda&status=done&filter=mine',
|
||||||
'langs'=>'agenda',
|
'langs'=>'agenda',
|
||||||
'position'=>112,
|
'position'=>112,
|
||||||
'perms'=>'$user->rights->agenda->myactions->read',
|
'perms'=>'$user->rights->agenda->myactions->read',
|
||||||
@ -338,7 +338,7 @@ class modAgenda extends DolibarrModules
|
|||||||
'type'=>'left',
|
'type'=>'left',
|
||||||
'titre'=>'MenuToDoActions',
|
'titre'=>'MenuToDoActions',
|
||||||
'mainmenu'=>'agenda',
|
'mainmenu'=>'agenda',
|
||||||
'url'=>'/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=todo&filtert=-1',
|
'url'=>'/comm/action/list.php?mainmenu=agenda&leftmenu=agenda&status=todo&filtert=-1',
|
||||||
'langs'=>'agenda',
|
'langs'=>'agenda',
|
||||||
'position'=>113,
|
'position'=>113,
|
||||||
'perms'=>'$user->rights->agenda->allactions->read',
|
'perms'=>'$user->rights->agenda->allactions->read',
|
||||||
@ -350,7 +350,7 @@ class modAgenda extends DolibarrModules
|
|||||||
'type'=>'left',
|
'type'=>'left',
|
||||||
'titre'=>'MenuDoneActions',
|
'titre'=>'MenuDoneActions',
|
||||||
'mainmenu'=>'agenda',
|
'mainmenu'=>'agenda',
|
||||||
'url'=>'/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=done&filtert=-1',
|
'url'=>'/comm/action/list.php?mainmenu=agenda&leftmenu=agenda&status=done&filtert=-1',
|
||||||
'langs'=>'agenda',
|
'langs'=>'agenda',
|
||||||
'position'=>114,
|
'position'=>114,
|
||||||
'perms'=>'$user->rights->agenda->allactions->read',
|
'perms'=>'$user->rights->agenda->allactions->read',
|
||||||
|
|||||||
@ -251,7 +251,7 @@ if ($object->id > 0)
|
|||||||
$filters=array();
|
$filters=array();
|
||||||
$filters['search_agenda_label']=$search_agenda_label;
|
$filters['search_agenda_label']=$search_agenda_label;
|
||||||
|
|
||||||
// TODO Replace this with same code than into listactions.php
|
// TODO Replace this with same code than into list.php
|
||||||
//show_actions_done($conf,$langs,$db,$object,null,0,$actioncode, '', $filters, $sortfield, $sortorder);
|
//show_actions_done($conf,$langs,$db,$object,null,0,$actioncode, '', $filters, $sortfield, $sortorder);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -201,7 +201,7 @@ else
|
|||||||
dol_fiche_head($head, 'resources', $langs->trans("Action"), -1, 'action');
|
dol_fiche_head($head, 'resources', $langs->trans("Action"), -1, 'action');
|
||||||
|
|
||||||
$linkback =img_picto($langs->trans("BackToList"),'object_list','class="hideonsmartphone pictoactionview"');
|
$linkback =img_picto($langs->trans("BackToList"),'object_list','class="hideonsmartphone pictoactionview"');
|
||||||
$linkback.= '<a href="'.DOL_URL_ROOT.'/comm/action/listactions.php">'.$langs->trans("BackToList").'</a>';
|
$linkback.= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php">'.$langs->trans("BackToList").'</a>';
|
||||||
|
|
||||||
// Link to other agenda views
|
// Link to other agenda views
|
||||||
$out='';
|
$out='';
|
||||||
|
|||||||
@ -186,7 +186,7 @@ if ($socid > 0)
|
|||||||
$filters=array();
|
$filters=array();
|
||||||
$filters['search_agenda_label']=$search_agenda_label;
|
$filters['search_agenda_label']=$search_agenda_label;
|
||||||
|
|
||||||
// TODO Replace this with same code than into listactions.php
|
// TODO Replace this with same code than into list.php
|
||||||
show_actions_done($conf,$langs,$db,$object,null,0,$actioncode, '', $filters, $sortfield, $sortorder);
|
show_actions_done($conf,$langs,$db,$object,null,0,$actioncode, '', $filters, $sortfield, $sortorder);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user