Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
genotoul-bioinfo
ng6
Commits
5b0b5b88
Commit
5b0b5b88
authored
Feb 19, 2014
by
Jerome Mariette
Browse files
update organism > tx_nG6_organism
parent
6ab977ce
Changes
2
Hide whitespace changes
Inline
Side-by-side
ui/nG6/class.tx_nG6_eid.php
View file @
5b0b5b88
...
...
@@ -457,6 +457,7 @@ class tx_nG6_eid {
// group search
}
else
{
if
(
$col
==
"location"
||
$col
==
"organism"
)
{
$col
=
"tx_nG6_"
.
$col
;
}
$res
=
tx_nG6_db
::
get_all_starts_with_in_group
(
$name_start
,
$col
);
}
$json_res
=
json_encode
(
$res
);
...
...
ui/nG6/lib/class.tx_nG6_db.php
View file @
5b0b5b88
...
...
@@ -1730,7 +1730,7 @@ class tx_nG6_db {
*/
function
get_all_names_starting_with
(
$name_start
,
$user_col
)
{
$queryParts
=
Array
(
'SELECT'
=>
'fe_users.uid, fe_users.username, fe_users.last_name, fe_users.first_name, fe_users.password, fe_users.email, fe_users.cruser_id, fe_groups.title, fe_groups.organism, fe_groups.location'
,
'SELECT'
=>
'fe_users.uid, fe_users.username, fe_users.last_name, fe_users.first_name, fe_users.password, fe_users.email, fe_users.cruser_id, fe_groups.title, fe_groups.
tx_nG6_
organism, fe_groups.
tx_nG6_
location'
,
'FROM'
=>
'fe_users INNER JOIN fe_groups ON fe_users.usergroup=fe_groups.uid'
,
'WHERE'
=>
'fe_users.'
.
$user_col
.
' LIKE "'
.
$name_start
.
'%"'
,
'GROUPBY'
=>
''
,
...
...
@@ -1749,8 +1749,8 @@ class tx_nG6_db {
'email'
=>
$res_row
[
'email'
],
'title'
=>
$res_row
[
'title'
],
'cruser_id'
=>
$res_row
[
'cruser_id'
],
'organism'
=>
$res_row
[
'organism'
],
'location'
=>
$res_row
[
'location'
]
'organism'
=>
$res_row
[
'
tx_nG6_
organism'
],
'location'
=>
$res_row
[
'
tx_nG6_
location'
]
);
}
...
...
@@ -1782,14 +1782,14 @@ class tx_nG6_db {
$res_tab
[]
=
array
(
'uid'
=>
$res_row
[
'uid'
],
'title'
=>
$res_row
[
'title'
],
'organism'
=>
$res_row
[
'organism'
],
'location'
=>
$res_row
[
'location'
]
'organism'
=>
$res_row
[
'
tx_nG6_
organism'
],
'location'
=>
$res_row
[
'
tx_nG6_
location'
]
);
}
else
{
if
(
!
isset
(
$distinct
[
$res_row
[
$col
]])
)
{
$res_tab
[]
=
array
(
'uid'
=>
$res_row
[
'uid'
],
$col
=>
$res_row
[
$col
]
substr
(
$col
,
7
)
=>
$res_row
[
$col
]
);
$distinct
[
$res_row
[
$col
]]
=
True
;
}
...
...
@@ -2083,16 +2083,16 @@ class tx_nG6_db {
// Create new user
$group_datas
=
array
(
'cruser_id'
=>
$cruser_id
,
'title'
=>
$group_name
,
'organism'
=>
$organism
,
'location'
=>
$location
,
'hidden'
=>
0
,
'deleted'
=>
0
,
'description'
=>
''
,
'subgroup'
=>
''
,
'tstamp'
=>
time
(),
'crdate'
=>
time
()
'cruser_id'
=>
$cruser_id
,
'title'
=>
$group_name
,
'
tx_nG6_
organism'
=>
$organism
,
'
tx_nG6_
location'
=>
$location
,
'hidden'
=>
0
,
'deleted'
=>
0
,
'description'
=>
''
,
'subgroup'
=>
''
,
'tstamp'
=>
time
(),
'crdate'
=>
time
()
);
$GLOBALS
[
'TYPO3_DB'
]
->
exec_INSERTquery
(
'fe_groups'
,
$group_datas
);
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment