lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1989 from aternatik/fix_resource

Browse Source 
Missing translate key into resource module
This commit is contained in:
Laurent Destailleur 2014-10-30 17:32:02 +01:00
commit 2517d54196
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/langs/en_US/resource.lang
View File

@ -32,4 +32,6 @@ ResourceLinkedWithSuccess=Resource linked with success
TitleResourceCard=Resource card TitleResourceCard=Resource card
ConfirmDeleteResource=Confirm to delete this resource ConfirmDeleteResource=Confirm to delete this resource
RessourceSuccessfullyDeleted=Resource successfully deleted RessourceSuccessfullyDeleted=Resource successfully deleted
DictionaryResourceType=Type of resources DictionaryResourceType=Type of resources
SelectResource=Select resource

4
htdocs/langs/fr_FR/resource.lang
View File

@ -32,4 +32,6 @@ ResourceLinkedWithSuccess=Ressource liée avec succès
TitleResourceCard=Fiche ressource TitleResourceCard=Fiche ressource
ConfirmDeleteResource=Confirmer la suppression de cette ressource? ConfirmDeleteResource=Confirmer la suppression de cette ressource?
RessourceSuccessfullyDeleted=Ressource effacée avec succès RessourceSuccessfullyDeleted=Ressource effacée avec succès
DictionaryResourceType=Type de ressources DictionaryResourceType=Type de ressources
SelectResource=Sélectionner la ressource

22
htdocs/resource/class/resource.class.php
View File

@ -23,8 +23,8 @@
*/ */
// Put here all includes required by your class file // Put here all includes required by your class file
require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); require_once DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php";
require_once DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php";
/** /**
* DAO Resource object * DAO Resource object
@ -330,12 +330,12 @@ class Resource extends CommonObject
function delete($rowid, $notrigger=0) function delete($rowid, $notrigger=0)
{ {
global $user,$langs,$conf; global $user,$langs,$conf;
$error=0; $error=0;
$sql = "DELETE FROM ".MAIN_DB_PREFIX."resource"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."resource";
$sql.= " WHERE rowid =".$rowid; $sql.= " WHERE rowid =".$rowid;
dol_syslog(get_class($this)."::delete sql=".$sql); dol_syslog(get_class($this)."::delete sql=".$sql);
if ($this->db->query($sql)) if ($this->db->query($sql))
{ {
@ -355,7 +355,7 @@ class Resource extends CommonObject
} }
// End call triggers // End call triggers
} }
return 1; return 1;
} }
else { else {
@ -371,7 +371,7 @@ class Resource extends CommonObject
return -1; return -1;
} }
} }
/** /**
* Load resource objects into $this->lines * Load resource objects into $this->lines
* *
@ -507,9 +507,9 @@ class Resource extends CommonObject
$line->fk_user_create = $obj->fk_user_create; $line->fk_user_create = $obj->fk_user_create;
if($obj->resource_id && $obj->resource_type) if($obj->resource_id && $obj->resource_type)
$line->objresource = $this->fetchObjectByElement($obj->resource_id,$obj->resource_type); $line->objresource = fetchObjectByElement($obj->resource_id,$obj->resource_type);
if($obj->element_id && $obj->element_type) if($obj->element_id && $obj->element_type)
$line->objelement = $this->fetchObjectByElement($obj->element_id,$obj->element_type); $line->objelement = fetchObjectByElement($obj->element_id,$obj->element_type);
$this->lines[$i] = $line; $this->lines[$i] = $line;
$i++; $i++;
@ -591,7 +591,7 @@ class Resource extends CommonObject
$line->mandatory = $obj->mandatory; $line->mandatory = $obj->mandatory;
$line->fk_user_create = $obj->fk_user_create; $line->fk_user_create = $obj->fk_user_create;
$this->lines[$i] = $this->fetchObjectByElement($obj->resource_id,$obj->resource_type); $this->lines[$i] = fetchObjectByElement($obj->resource_id,$obj->resource_type);
$i++; $i++;
} }
@ -814,7 +814,7 @@ class Resource extends CommonObject
$i=0; $i=0;
foreach($resources as $nb => $resource) foreach($resources as $nb => $resource)
{ {
$this->lines[$i] = $this->fetchObjectByElement($resource['resource_id'],$resource['resource_type']); $this->lines[$i] = fetchObjectByElement($resource['resource_id'],$resource['resource_type']);
$i++; $i++;
} }
return $i; return $i;