From bcd254c137e927e8e611898e2cbce2f6712c7321 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 15 Jun 2015 00:12:52 +0200
Subject: [PATCH] Fix bad objet use. Add label of project into list.
---
htdocs/projet/activity/index.php | 17 +++++++++++------
htdocs/projet/activity/perday.php | 20 ++++++++++----------
htdocs/projet/activity/perweek.php | 16 ++++++++--------
3 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index 845e99e54a0..75fd12e9d95 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2006-2010 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2010 Regis Houssin <regis.houssin@capnetworks.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -103,7 +103,8 @@ if ( $resql )
print '<td>';
$projectstatic->id=$row->rowid;
$projectstatic->ref=$row->ref;
- print $projectstatic->getNomUrl(1);
+ $projectstatic->title=$row->title;
+ print $projectstatic->getNomUrl(1, '', 1);
print '</td>';
print '<td align="right">'.convertSecondToTime($row->nb).'</td>';
print "</tr>\n";
@@ -158,7 +159,8 @@ if ( $resql )
print '<td>';
$projectstatic->id=$row->rowid;
$projectstatic->ref=$row->ref;
- print $projectstatic->getNomUrl(1);
+ $projectstatic->title=$row->title;
+ print $projectstatic->getNomUrl(1, '', 1);
print '</td>';
print '<td align="right">'.convertSecondToTime($row->nb).'</td>';
print "</tr>\n";
@@ -219,7 +221,8 @@ if ( $resql )
print '<td>';
$projectstatic->id=$row->rowid;
$projectstatic->ref=$row->ref;
- print $projectstatic->getNomUrl(1);
+ $projectstatic->title=$row->title;
+ print $projectstatic->getNomUrl(1, '', 1);
print '</td>';
print '<td align="right">'.convertSecondToTime($row->nb).'</td>';
print "</tr>\n";
@@ -270,7 +273,8 @@ if ( $resql )
print '<td>';
$projectstatic->id=$row->rowid;
$projectstatic->ref=$row->ref;
- print $projectstatic->getNomUrl(1);
+ $projectstatic->title=$row->title;
+ print $projectstatic->getNomUrl(1, '', 1);
print '</td>';
print '<td align="right">'.convertSecondToTime($row->nb).'</td>';
print "</tr>\n";
@@ -317,7 +321,8 @@ if ( $resql )
print '<td>';
$projectstatic->id=$row->rowid;
$projectstatic->ref=$row->ref;
- print $projectstatic->getNomUrl(1);
+ $projectstatic->title=$row->title;
+ print $projectstatic->getNomUrl(1, '', 1);
print '</td>';
print '<td align="right">'.convertSecondToTime($row->nb).'</td>';
print "</tr>\n";
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index f1431f37042..ee50358bdc5 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -116,7 +116,7 @@ if ($action == 'assign')
setEventMessages($object->error, $object->errors, 'errors');
}
}
-
+
$action='';
}
@@ -148,24 +148,24 @@ if ($action == 'addtime' && $user->rights->projet->creer)
{
foreach($timespent_duration as $key => $val)
{
- $task->fetch($key);
- $task->progress = GETPOST($key . 'progress', 'int');
- $task->timespent_duration = $val;
- $task->timespent_fk_user = $user->id;
+ $object->fetch($key);
+ $object->progress = GETPOST($key . 'progress', 'int');
+ $object->timespent_duration = $val;
+ $object->timespent_fk_user = $user->id;
if (GETPOST($key."hour") != '' && GETPOST($key."hour") >= 0) // If hour was entered
{
- $task->timespent_date = dol_mktime(GETPOST($key."hour"),GETPOST($key."min"),0,GETPOST($key."month"),GETPOST($key."day"),GETPOST($key."year"));
- $task->timespent_withhour = 1;
+ $object->timespent_date = dol_mktime(GETPOST($key."hour"),GETPOST($key."min"),0,GETPOST($key."month"),GETPOST($key."day"),GETPOST($key."year"));
+ $object->timespent_withhour = 1;
}
else
{
- $task->timespent_date = dol_mktime(12,0,0,GETPOST($key."month"),GETPOST($key."day"),GETPOST($key."year"));
+ $object->timespent_date = dol_mktime(12,0,0,GETPOST($key."month"),GETPOST($key."day"),GETPOST($key."year"));
}
- $result=$task->addTimeSpent($user);
+ $result=$object->addTimeSpent($user);
if ($result < 0)
{
- setEventMessages($task->error, $task->errors, 'errors');
+ setEventMessages($object->error, $object->errors, 'errors');
$error++;
break;
}
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index e161261878c..85874af86b9 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -134,7 +134,7 @@ if ($action == 'assign')
setEventMessages($object->error, $object->errors, 'errors');
}
}
-
+
$action='';
}
@@ -162,16 +162,16 @@ if ($action == 'addtime' && $user->rights->projet->creer)
if ($newduration > 0)
{
- $task->fetch($taskid);
- $task->progress = GETPOST($taskid . 'progress', 'int');
- $task->timespent_duration = $newduration;
- $task->timespent_fk_user = $usertoprocess->id;
- $task->timespent_date = dol_time_plus_duree($firstdaytoshow, $key, 'd');
+ $object->fetch($taskid);
+ $object->progress = GETPOST($taskid . 'progress', 'int');
+ $object->timespent_duration = $newduration;
+ $object->timespent_fk_user = $usertoprocess->id;
+ $object->timespent_date = dol_time_plus_duree($firstdaytoshow, $key, 'd');
- $result=$task->addTimeSpent($user);
+ $result=$object->addTimeSpent($user);
if ($result < 0)
{
- setEventMessages($task->error, $task->errors, 'errors');
+ setEventMessages($object->error, $object->errors, 'errors');
$error++;
break;
}
--
GitLab