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
01e5fabd
Commit
01e5fabd
authored
13 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
New: Increase length of project label into agenda filter
parent
dc80f74d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
htdocs/comm/action/index.php
+1
-1
1 addition, 1 deletion
htdocs/comm/action/index.php
htdocs/core/lib/agenda.lib.php
+1
-1
1 addition, 1 deletion
htdocs/core/lib/agenda.lib.php
htdocs/core/lib/project.lib.php
+5
-4
5 additions, 4 deletions
htdocs/core/lib/project.lib.php
with
7 additions
and
6 deletions
htdocs/comm/action/index.php
+
1
−
1
View file @
01e5fabd
<?php
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Eric Seigne <erics@rycks.com>
* Copyright (C) 2004-201
1
Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-201
2
Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
*
...
...
This diff is collapsed.
Click to expand it.
htdocs/core/lib/agenda.lib.php
+
1
−
1
View file @
01e5fabd
...
...
@@ -103,7 +103,7 @@ function print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirt
print
'<td nowrap="nowrap">'
;
print
$langs
->
trans
(
"Project"
)
.
' '
;
print
'</td><td nowrap="nowrap">'
;
select_projects
(
$socid
?
$socid
:-
1
,
$pid
,
'projectid'
);
select_projects
(
$socid
?
$socid
:-
1
,
$pid
,
'projectid'
,
64
);
print
'</td></tr>'
;
}
...
...
This diff is collapsed.
Click to expand it.
htdocs/core/lib/project.lib.php
+
5
−
4
View file @
01e5fabd
...
...
@@ -157,9 +157,10 @@ function task_prepare_head($object)
* @param int $socid Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)
* @param int $selected Id project preselected
* @param string $htmlname Nom de la zone html
* @param int $maxlength Maximum length of label
* @return int Nbre of project if OK, <0 if KO
*/
function
select_projects
(
$socid
=-
1
,
$selected
=
''
,
$htmlname
=
'projectid'
)
function
select_projects
(
$socid
=-
1
,
$selected
=
''
,
$htmlname
=
'projectid'
,
$maxlength
=
16
)
{
global
$db
,
$user
,
$conf
,
$langs
;
...
...
@@ -173,7 +174,7 @@ function select_projects($socid=-1, $selected='', $htmlname='projectid')
$projectsListId
=
$projectstatic
->
getProjectsAuthorizedForUser
(
$user
,
0
,
1
);
}
//
On recherche les
projets
//
Search all
proje
c
ts
$sql
=
'SELECT p.rowid, p.ref, p.title, p.fk_soc, p.fk_statut, p.public'
;
$sql
.
=
' FROM '
.
MAIN_DB_PREFIX
.
'projet as p'
;
$sql
.
=
" WHERE p.entity = "
.
$conf
->
entity
;
...
...
@@ -201,7 +202,7 @@ function select_projects($socid=-1, $selected='', $htmlname='projectid')
}
else
{
$labeltoshow
=
dol_trunc
(
$obj
->
ref
,
1
6
);
$labeltoshow
=
dol_trunc
(
$obj
->
ref
,
1
8
);
//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
//else $labeltoshow.=' ('.$langs->trans("Private").')';
if
(
!
empty
(
$selected
)
&&
$selected
==
$obj
->
rowid
&&
$obj
->
fk_statut
>
0
)
...
...
@@ -233,7 +234,7 @@ function select_projects($socid=-1, $selected='', $htmlname='projectid')
//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
//else $labeltoshow.=' ('.$langs->trans("Private").')';
$resultat
.
=
'>'
.
$labeltoshow
;
if
(
!
$disabled
)
$resultat
.
=
' - '
.
dol_trunc
(
$obj
->
title
,
12
);
if
(
!
$disabled
)
$resultat
.
=
' - '
.
dol_trunc
(
$obj
->
title
,
$maxlength
);
$resultat
.
=
'</option>'
;
}
print
$resultat
;
...
...
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