Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
d0c3a791
Commit
d0c3a791
authored
10 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Fix: visible task into area "time" for "My task" must limit task to
tasks i am assigned to.
parent
48fc9456
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChangeLog
+3
-1
3 additions, 1 deletion
ChangeLog
htdocs/projet/tasks/time.php
+8
-3
8 additions, 3 deletions
htdocs/projet/tasks/time.php
with
11 additions
and
4 deletions
ChangeLog
+
3
−
1
View file @
d0c3a791
...
...
@@ -15,7 +15,9 @@ Fix: [ bug #1528 ] Leopard Services numeration module description is not transla
Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne s'appliquent pas
Fix: [ bug #1534 ] Unknown error when deleting a product photo under special circumstances
Fix: Update impayees.php
Fix: Fix Link product, In list view and label product
Fix: Link product, In list view and label product
Fix: visible task into area "time" for "My task" must limit task to tasks i am assigned to.
Fix: When disabled, all fields to add time into task line must be disabled.
***** ChangeLog for 3.5.4 compared to 3.5.3 *****
Fix: Hide title of event when agenda module disabled.
...
...
This diff is collapsed.
Click to expand it.
htdocs/projet/tasks/time.php
+
8
−
3
View file @
d0c3a791
...
...
@@ -65,7 +65,8 @@ if ($action == 'addtimespent' && $user->rights->projet->creer)
}
if
(
empty
(
$_POST
[
"userid"
]))
{
setEventMessage
(
$langs
->
trans
(
'ErrorUserNotAffectedToTask'
),
'errors'
);
$langs
->
load
(
"errors"
);
setEventMessage
(
$langs
->
trans
(
'ErrorUserNotAssignedToTask'
),
'errors'
);
$error
++
;
}
...
...
@@ -327,9 +328,13 @@ if ($id > 0 || ! empty($ref))
// Contributor
print
'<td class="nowrap">'
;
$contactoftask
=
$object
->
getListContactId
(
'internal'
);
$restrictaddtimetocontactoftask
=
0
;
if
(
empty
(
$conf
->
global
->
PROJECT_TIME_ON_ALL_TASKS_MY_PROJECTS
))
{
$restrictaddtimetocontactoftask
=
$object
->
getListContactId
(
'internal'
);
}
print
img_object
(
''
,
'user'
);
print
$form
->
select_dolusers
(
$_POST
[
"userid"
]
?
$_POST
[
"userid"
]
:
$user
->
id
,
'userid'
,
0
,
''
,
0
,
''
,
$
contactoftask
);
print
$form
->
select_dolusers
(
$_POST
[
"userid"
]
?
$_POST
[
"userid"
]
:
$user
->
id
,
'userid'
,
0
,
''
,
0
,
''
,
$
restrictaddtimetocontactoftask
);
// Note: If user is not allowed it will be disabled into combo list and userid not posted
print
'</td>'
;
// Note
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment