Fix: Permission to read donation doc

This commit is contained in:
Laurent Destailleur 2008-11-15 18:13:25 +00:00
parent a0bb4b19ea
commit 6f31feb6fc
2 changed files with 56 additions and 14 deletions

View File

@ -273,7 +273,7 @@ if ($_GET["rowid"] && $_GET["action"] == 'edit')
$hselected=$h; $hselected=$h;
$h++; $h++;
dolibarr_fiche_head($head, $hselected, $langs->trans("Ref").": ".$_GET["rowid"]); dolibarr_fiche_head($head, $hselected, $langs->trans("Ref"));
print '<form name="update" action="fiche.php" method="post">'; print '<form name="update" action="fiche.php" method="post">';
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
@ -281,16 +281,24 @@ if ($_GET["rowid"] && $_GET["action"] == 'edit')
print '<input type="hidden" name="action" value="update">'; print '<input type="hidden" name="action" value="update">';
print '<input type="hidden" name="rowid" value="'.$don->id.'">'; print '<input type="hidden" name="rowid" value="'.$don->id.'">';
// Ref
print "<tr>".'<td>'.$langs->trans("Ref").'</td><td colspan="2">';
print $don->getNomUrl();
print '</td>';
print '</tr>';
// Date
print "<tr>".'<td>'.$langs->trans("Date").'</td><td>'; print "<tr>".'<td>'.$langs->trans("Date").'</td><td>';
$html->select_date($don->date,'','','','',"update"); $html->select_date($don->date,'','','','',"update");
print '</td>'; print '</td>';
$nbrows=12; $nbrows=12;
if ($conf->projet->enabled) $nbrows++; if ($conf->projet->enabled) $nbrows++;
print '<td rowspan="'.$nbrows.'" valign="top">'.$langs->trans("Comments").' :<br>'; print '<td rowspan="'.$nbrows.'" valign="top">'.$langs->trans("Comments").' :<br>';
print "<textarea name=\"comment\" wrap=\"soft\" cols=\"40\" rows=\"15\">".$don->note."</textarea></td></tr>"; print "<textarea name=\"comment\" wrap=\"soft\" cols=\"40\" rows=\"15\">".$don->note."</textarea></td></tr>";
// Project
if ($conf->projet->enabled) if ($conf->projet->enabled)
{ {
print "<tr><td>".$langs->trans("Project")."</td><td><select name=\"projetid\">\n"; print "<tr><td>".$langs->trans("Project")."</td><td><select name=\"projetid\">\n";
@ -314,7 +322,7 @@ if ($_GET["rowid"] && $_GET["action"] == 'edit')
print "</select><br>"; print "</select><br>";
print "</td></tr>\n"; print "</td></tr>\n";
} }
print "<tr><td>".$langs->trans("PublicDonation")."</td><td>"; print "<tr><td>".$langs->trans("PublicDonation")."</td><td>";
print $html->selectyesno("public",1,1); print $html->selectyesno("public",1,1);
print "</td>"; print "</td>";
@ -370,16 +378,24 @@ if ($_GET["rowid"] && $_GET["action"] != 'edit')
print "<form action=\"fiche.php\" method=\"post\">"; print "<form action=\"fiche.php\" method=\"post\">";
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
// Ref
print "<tr>".'<td>'.$langs->trans("Ref").'</td><td colspan="2">';
print $don->getNomUrl();
print '</td>';
print '</tr>';
// Date
print "<tr><td>".$langs->trans("Date")."</td><td>"; print "<tr><td>".$langs->trans("Date")."</td><td>";
print dolibarr_print_date($don->date,"day"); print dolibarr_print_date($don->date,"day");
print "</td>"; print "</td>";
$nbrows=12; $nbrows=12;
if ($conf->projet->enabled) $nbrows++; if ($conf->projet->enabled) $nbrows++;
print '<td rowspan="'.$nbrows.'" valign="top" width="50%">'.$langs->trans("Comments").' :<br>'; print '<td rowspan="'.$nbrows.'" valign="top" width="50%">'.$langs->trans("Comments").' :<br>';
print nl2br($don->note).'</td></tr>'; print nl2br($don->note).'</td></tr>';
// Project
if ($conf->projet->enabled) if ($conf->projet->enabled)
{ {
print "<tr>".'<td>'.$langs->trans("Project").'</td><td>'.$don->projet.'</td></tr>'; print "<tr>".'<td>'.$langs->trans("Project").'</td><td>'.$don->projet.'</td></tr>';

View File

@ -24,12 +24,14 @@
* \version $Id$ * \version $Id$
*/ */
require_once(DOL_DOCUMENT_ROOT ."/commonobject.class.php");
/** /**
* \class Don * \class Don
* \brief Classe permettant la gestion des dons * \brief Classe permettant la gestion des dons
*/ */
class Don class Don extends CommonObject
{ {
var $db; var $db;
var $error; var $error;
@ -358,18 +360,18 @@ class Don
if ( $this->db->query( $sql) ) if ( $this->db->query( $sql) )
{ {
if ( $this->db->affected_rows() ) if ( $this->db->affected_rows() )
{ {
return 1; return 1;
} }
else else
{ {
return -1; return -1;
} }
} }
else else
{ {
dolibarr_print_error($this->db); dolibarr_print_error($this->db);
return -1; return -1;
} }
} }
@ -539,5 +541,29 @@ class Don
return $result; return $result;
} }
/**
* \brief Return clicable name (with picto eventually)
* \param withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul
* \return string Chaine avec URL
*/
function getNomUrl($withpicto=0)
{
global $langs;
$result='';
$lien = '<a href="'.DOL_URL_ROOT.'/compta/dons/fiche.php?rowid='.$this->id.'">';
$lienfin='</a>';
$picto='generic';
$label=$langs->trans("ShowDonation").': '.$this->ref;
if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
if ($withpicto && $withpicto != 2) $result.=' ';
if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin;
return $result;
}
} }
?> ?>