Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
mahara
mahara
Commits
9430f362
Commit
9430f362
authored
Dec 01, 2017
by
Cecilia Vela Gurovic
Committed by
Gerrit Code Review
Dec 01, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Bug 1735252: Index and display the actualy country name rather than ISO code"
parents
8baa642a
947131d7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
0 deletions
+8
-0
htdocs/search/elasticsearch/type/ElasticsearchType_artefact.php
.../search/elasticsearch/type/ElasticsearchType_artefact.php
+8
-0
No files found.
htdocs/search/elasticsearch/type/ElasticsearchType_artefact.php
View file @
9430f362
...
...
@@ -214,6 +214,10 @@ class ElasticsearchType_artefact extends ElasticsearchType {
$terms
=
explode
(
"|"
,
$map
[
$record
->
artefacttype
]
);
$record
->
mainfacetterm
=
$terms
[
2
];
$record
->
secfacetterm
=
$terms
[
1
];
if
(
$record
->
artefacttype
==
'country'
)
{
// We need to index the actual name and not the iso code
$record
->
title
=
get_string
(
"country.
{
$record
->
title
}
"
);
}
require_once
(
get_config
(
'docroot'
)
.
'artefact/resume/lib.php'
);
if
(
PluginArtefactResume
::
is_active
())
{
...
...
@@ -278,6 +282,10 @@ class ElasticsearchType_artefact extends ElasticsearchType {
"
\n
"
,
"
\r
"
),
' '
,
strip_tags
(
$record
->
title
)
);
if
(
$record
->
artefacttype
==
'country'
)
{
// We need to display the actual name and not the iso code
$record
->
title
=
get_string
(
"country.
{
$record
->
title
}
"
);
}
$record
->
description
=
str_replace
(
array
(
"
\r\n
"
,
"
\n
"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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