';
-
+
+ print '
';
+
print '
';
- print '
';
-
- // Alias name (commercial, trademark or alias name)
- print '| '.$langs->trans('AliasNames').' | ';
- print $socstatic->name_alias;
- print " |
";
-
- print '
';
+ print '
';
- print '';
-
- dol_fiche_end();
-
- $object = $savobject;
- }
- }
+ // Alias name (commercial, trademark or alias name)
+ print '| '.$langs->trans('AliasNames').' | ';
+ print $socstatic->name_alias;
+ print " |
";
+
+ print '
';
+
+ print '
';
+
+ dol_fiche_end();
+
+ $object = $savobject;
+ }
+ }
- //print load_fiche_titre($langs->trans('ResourcesLinkedToElement'),'','');
+ //print load_fiche_titre($langs->trans('ResourcesLinkedToElement'),'','');
- foreach ($object->available_resources as $modresources => $resources)
- {
- $resources=(array) $resources; // To be sure $resources is an array
- foreach($resources as $resource_obj)
- {
- $element_prop = getElementProperties($resource_obj);
+ foreach ($object->available_resources as $modresources => $resources)
+ {
+ $resources=(array) $resources; // To be sure $resources is an array
+ foreach($resources as $resource_obj)
+ {
+ $element_prop = getElementProperties($resource_obj);
- //print '/'.$modresources.'/class/'.$resource_obj.'.class.php
';
+ //print '/'.$modresources.'/class/'.$resource_obj.'.class.php
';
- $path = '';
- if(strpos($resource_obj,'@'))
- $path .= '/'.$element_prop['module'];
+ $path = '';
+ if(strpos($resource_obj,'@'))
+ $path .= '/'.$element_prop['module'];
- $linked_resources = $object->getElementResources($element,$element_id,$resource_obj);
+ $linked_resources = $object->getElementResources($element,$element_id,$resource_obj);
- // If we have a specific template we use it
- if(file_exists(dol_buildpath($path.'/core/tpl/resource_'.$element_prop['element'].'_add.tpl.php')))
- {
- $res=include dol_buildpath($path.'/core/tpl/resource_'.$element_prop['element'].'_add.tpl.php');
- }
- else
- {
- $res=include DOL_DOCUMENT_ROOT . '/core/tpl/resource_add.tpl.php';
- }
+ // If we have a specific template we use it
+ if(file_exists(dol_buildpath($path.'/core/tpl/resource_'.$element_prop['element'].'_add.tpl.php')))
+ {
+ $res=include dol_buildpath($path.'/core/tpl/resource_'.$element_prop['element'].'_add.tpl.php');
+ }
+ else
+ {
+ $res=include DOL_DOCUMENT_ROOT . '/core/tpl/resource_add.tpl.php';
+ }
//var_dump($element_id);
- if ($mode != 'add' || $resource_obj != $resource_type)
- {
- //print load_fiche_titre($langs->trans(ucfirst($element_prop['element']).'Singular'));
+ if ($mode != 'add' || $resource_obj != $resource_type)
+ {
+ //print load_fiche_titre($langs->trans(ucfirst($element_prop['element']).'Singular'));
- // If we have a specific template we use it
- if(file_exists(dol_buildpath($path.'/core/tpl/resource_'.$element_prop['element'].'_view.tpl.php')))
- {
- $res=@include dol_buildpath($path.'/core/tpl/resource_'.$element_prop['element'].'_view.tpl.php');
+ // If we have a specific template we use it
+ if(file_exists(dol_buildpath($path.'/core/tpl/resource_'.$element_prop['element'].'_view.tpl.php')))
+ {
+ $res=@include dol_buildpath($path.'/core/tpl/resource_'.$element_prop['element'].'_view.tpl.php');
- }
- else
- {
- $res=include DOL_DOCUMENT_ROOT . '/core/tpl/resource_view.tpl.php';
- }
- }
- }
- }
+ }
+ else
+ {
+ $res=include DOL_DOCUMENT_ROOT . '/core/tpl/resource_view.tpl.php';
+ }
+ }
+ }
+ }
}
llxFooter();
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 9bfa7309167..d5b56cc9781 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -1,5 +1,5 @@
+/* Copyright (C) 2013-2014 Jean-François Ferry
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,34 +16,34 @@
*/
/**
- * \file resource/index.php
- * \ingroup resource
- * \brief Page to manage resource objects
+ * \file resource/index.php
+ * \ingroup resource
+ * \brief Page to manage resource objects
*/
require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/resource/class/resource.class.php';
+require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
-// Load translations files requiredby by page
+// Load translations files required by page
$langs->load("resource");
$langs->load("companies");
$langs->load("other");
// Get parameters
-$id = GETPOST('id','int');
-$action = GETPOST('action','alpha');
+$id = GETPOST('id','int');
+$action = GETPOST('action','alpha');
-$lineid = GETPOST('lineid','int');
-$element = GETPOST('element','alpha');
-$element_id = GETPOST('element_id','int');
-$resource_id = GETPOST('resource_id','int');
+$lineid = GETPOST('lineid','int');
+$element = GETPOST('element','alpha');
+$element_id = GETPOST('element_id','int');
+$resource_id = GETPOST('resource_id','int');
-$sortorder = GETPOST('sortorder','alpha');
-$sortfield = GETPOST('sortfield','alpha');
-$page = GETPOST('page','int');
+$sortorder = GETPOST('sortorder','alpha');
+$sortfield = GETPOST('sortfield','alpha');
+$page = GETPOST('page','int');
-$object = new Resource($db);
+$object = new Dolresource($db);
$hookmanager->initHooks(array('resource_list'));
@@ -52,7 +52,7 @@ if (empty($sortfield)) $sortfield="t.rowid";
if (empty($arch)) $arch = 0;
if ($page == -1) {
- $page = 0 ;
+ $page = 0 ;
}
$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
@@ -61,7 +61,7 @@ $pageprev = $page - 1;
$pagenext = $page + 1;
if( ! $user->rights->resource->read)
- accessforbidden();
+ accessforbidden();
/*
@@ -86,72 +86,91 @@ llxHeader('',$pagetitle,'');
// Confirmation suppression resource line
if ($action == 'delete_resource')
{
- print $form->formconfirm($_SERVER['PHP_SELF']."?element=".$element."&element_id=".$element_id."&lineid=".$lineid,$langs->trans("DeleteResource"),$langs->trans("ConfirmDeleteResourceElement"),"confirm_delete_resource",'','',1);
+ print $form->formconfirm($_SERVER['PHP_SELF']."?element=".$element."&element_id=".$element_id."&lineid=".$lineid,$langs->trans("DeleteResource"),$langs->trans("ConfirmDeleteResourceElement"),"confirm_delete_resource",'','',1);
}
// Load object list
$ret = $object->fetch_all($sortorder, $sortfield, $limit, $offset);
if($ret == -1) {
- dol_print_error($db,$object->error);
- exit;
+ dol_print_error($db,$object->error);
+ exit;
} else {
print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $ret+1, $object->num_all,'title_generic.png');
}
if(!$ret) {
- print ''.$langs->trans('NoResourceInDatabase').'
';
+ print ''.$langs->trans('NoResourceInDatabase').'
';
}
else
{
- $var=true;
+ $var=true;
- print ''."\n";
- print '';
- print_liste_field_titre($langs->trans('Id'),$_SERVER['PHP_SELF'],'t.rowid','',$param,'',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans('Ref'),$_SERVER['PHP_SELF'],'t.ref','',$param,'',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans('ResourceType'),$_SERVER['PHP_SELF'],'ty.code','',$param,'',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans('Action'),"","","","",'width="60" align="center"',"","");
- print "
\n";
+ print ''."\n";
+ print '';
+ print_liste_field_titre($langs->trans('Id'),$_SERVER['PHP_SELF'],'t.rowid','',$param,'',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans('Ref'),$_SERVER['PHP_SELF'],'t.ref','',$param,'',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans('ResourceType'),$_SERVER['PHP_SELF'],'ty.code','',$param,'',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans('Action'),"","","","",'width="60" align="center"',"","");
+ print "
\n";
- foreach ($object->lines as $resource)
- {
- $var=!$var;
+ foreach ($object->lines as $resource)
+ {
+ $var=!$var;
- $style='';
- if($resource->id == GETPOST('lineid'))
- $style='style="background: orange;"';
+ $style='';
+ if($resource->id == GETPOST('lineid'))
+ $style='style="background: orange;"';
- print '| ';
- print ''.$resource->id.'';
- print ' | ';
+ print '
| ';
+ print ''.$resource->id.'';
+ print ' | ';
- print '';
- print $resource->ref;
- print ' | ';
+ print '';
+ print $resource->ref;
+ print ' | ';
- print '';
- print $resource->type_label;
- print ' | ';
+ print '';
+ print $resource->type_label;
+ print ' | ';
- print '';
- print '';
- print img_edit();
- print '';
- print ' ';
- print '';
- print img_delete();
- print '';
- print ' | ';
+ print '';
+ print '';
+ print img_edit();
+ print '';
+ print ' ';
+ print '';
+ print img_delete();
+ print '';
+ print ' | ';
- print '
';
- }
+ print '';
+ }
- print '
';
+ print '
';
}
+/*
+ * Boutons actions
+*/
+print '';
+$parameters = array();
+$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
+// modified by hook
+if (empty($reshook))
+{
+ if ($action != "edit" )
+ {
+ // Edit resource
+ if($user->rights->resource->write)
+ {
+ print '
';
+ }
+ }
+}
+print '