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
cd066b82
Commit
cd066b82
authored
13 years ago
by
Regis Houssin
Browse files
Options
Downloads
Patches
Plain Diff
Fix: rename 'text' to 'string'
parent
0f4e74fa
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
htdocs/core/class/html.form.class.php
+3
-5
3 additions, 5 deletions
htdocs/core/class/html.form.class.php
htdocs/core/js/editinplace.js
+4
-4
4 additions, 4 deletions
htdocs/core/js/editinplace.js
with
7 additions
and
9 deletions
htdocs/core/class/html.form.class.php
+
3
−
5
View file @
cd066b82
<?php
/* Copyright (c) 2002-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-201
1
Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-201
2
Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-201
1
Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2005-201
2
Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
* Copyright (C) 2006 Marc Barilley/Ocebo <marc@ocebo.com>
* Copyright (C) 2007 Franky Van Liedekerke <franky.van.liedekerker@telenet.be>
...
...
@@ -87,7 +87,6 @@ class Form
if
(
$perm
)
{
$tmp
=
explode
(
':'
,
$typeofdata
);
if
(
preg_match
(
'/^(string|email|numeric)$/i'
,
$tmp
[
0
]))
$tmp
[
0
]
=
'text'
;
$ret
.
=
'<div class="editkey_'
.
$tmp
[
0
]
.
'" id="'
.
$htmlname
.
'">'
;
$ret
.
=
$langs
->
trans
(
$text
);
$ret
.
=
'</div>'
.
"
\n
"
;
...
...
@@ -237,8 +236,7 @@ class Form
if
(
preg_match
(
'/^(string|email|numeric)/'
,
$inputType
))
{
$tmp
=
explode
(
':'
,
$inputType
);
$inputType
=
'text'
;
$inputOption
=
$tmp
[
1
];
$inputType
=
$tmp
[
0
];
$inputOption
=
$tmp
[
1
];
if
(
!
empty
(
$tmp
[
2
]))
$savemethod
=
$tmp
[
2
];
}
if
(
preg_match
(
'/^datepicker/'
,
$inputType
))
...
...
This diff is collapsed.
Click to expand it.
htdocs/core/js/editinplace.js
+
4
−
4
View file @
cd066b82
...
...
@@ -107,7 +107,7 @@ $(document).ready(function() {
$
(
'
#val_
'
+
$
(
this
).
attr
(
'
id
'
)
).
click
();
});
$
(
'
.editval_
text
'
).
editable
(
urlSaveInPlace
,
{
$
(
'
.editval_
string
'
).
editable
(
urlSaveInPlace
,
{
type
:
'
text
'
,
id
:
'
field
'
,
width
:
300
,
...
...
@@ -118,7 +118,7 @@ $(document).ready(function() {
indicator
:
indicatorInPlace
,
submitdata
:
function
(
result
,
settings
)
{
var
htmlname
=
$
(
this
).
attr
(
'
id
'
).
substr
(
4
);
return
getParameters
(
'
text
'
,
htmlname
);
return
getParameters
(
'
string
'
,
htmlname
);
},
callback
:
function
(
result
,
settings
)
{
var
obj
=
$
.
parseJSON
(
result
);
...
...
@@ -131,7 +131,7 @@ $(document).ready(function() {
}
}
});
$
(
'
.editkey_
text
'
).
hover
(
$
(
'
.editkey_
string
'
).
hover
(
function
()
{
$
(
'
#val_
'
+
$
(
this
).
attr
(
'
id
'
)
).
addClass
(
"
editval_hover
"
);
},
...
...
@@ -139,7 +139,7 @@ $(document).ready(function() {
$
(
'
#val_
'
+
$
(
this
).
attr
(
'
id
'
)
).
removeClass
(
"
editval_hover
"
);
}
);
$
(
'
.editkey_
text
'
).
click
(
function
()
{
$
(
'
.editkey_
string
'
).
click
(
function
()
{
$
(
'
#val_
'
+
$
(
this
).
attr
(
'
id
'
)
).
click
();
});
...
...
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