Skip to content

Commit 2433464

Browse files
sergeytolkachyovsergeytolkachyov
committed
v.2.4.0 fix admin panel side bugs with multilanguage content
1 parent 19fa332 commit 2433464

File tree

5 files changed

+50
-46
lines changed

5 files changed

+50
-46
lines changed

‎com_swjprojects/admin/forms/filter_documentation.xml

+37-33
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,40 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<form addfieldprefix="Joomla\Component\SWJProjects\Administrator\Field">
3-
<fields name="filter">
4-
<field name="search" type="text" hint="JSEARCH_FILTER"/>
5-
<field name="published" type="list" onchange="this.form.submit();">
6-
<option value="">JOPTION_SELECT_PUBLISHED</option>
7-
<option value="1">JPUBLISHED</option>
8-
<option value="0">JUNPUBLISHED</option>
9-
<option value="-2">JTRASHED</option>
10-
</field>
11-
<field name="project" type="projects" onchange="this.form.submit();">
12-
<option value="">COM_SWJPROJECTS_PROJECT_SELECT</option>
13-
</field>
14-
</fields>
15-
<fields name="list">
16-
<field name="fullordering" type="list"
17-
onchange="this.form.submit();"
18-
default="d.ordering ASC">
19-
<option value="">JGLOBAL_SORT_BY</option>
20-
<option value="d.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
21-
<option value="d.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
22-
<option value="title ASC">JGLOBAL_TITLE_ASC</option>
23-
<option value="title DESC">JGLOBAL_TITLE_DESC</option>
24-
<option value="d.id ASC">JGRID_HEADING_ID_ASC</option>
25-
<option value="d.id DESC">JGRID_HEADING_ID_DESC</option>
26-
<option value="project_title ASC">COM_SWJPROJECTS_PROJECT_ASC</option>
27-
<option value="project_title DESC">COM_SWJPROJECTS_PROJECT_DESC</option>
28-
<option value="d.state ASC">JSTATUS_ASC</option>
29-
<option value="d.state DESC">JSTATUS_DESC</option>
30-
</field>
31-
<field name="limit" type="limitbox"
32-
class="inputbox input-mini"
33-
default="25"
34-
onchange="this.form.submit();"/>
35-
</fields>
3+
<fields name="filter">
4+
<field name="search" type="text" hint="JSEARCH_FILTER"/>
5+
<field name="published" type="list" onchange="this.form.submit();">
6+
<option value="">JOPTION_SELECT_PUBLISHED</option>
7+
<option value="1">JPUBLISHED</option>
8+
<option value="0">JUNPUBLISHED</option>
9+
<option value="-2">JTRASHED</option>
10+
</field>
11+
<field name="project"
12+
type="projects"
13+
layout="joomla.form.field.list-fancy-select"
14+
onchange="this.form.submit();">
15+
<option value="">COM_SWJPROJECTS_PROJECT_SELECT</option>
16+
</field>
17+
</fields>
18+
<fields name="list">
19+
<field name="fullordering"
20+
type="list"
21+
onchange="this.form.submit();"
22+
default="d.ordering ASC">
23+
<option value="">JGLOBAL_SORT_BY</option>
24+
<option value="d.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
25+
<option value="d.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
26+
<option value="title ASC">JGLOBAL_TITLE_ASC</option>
27+
<option value="title DESC">JGLOBAL_TITLE_DESC</option>
28+
<option value="d.id ASC">JGRID_HEADING_ID_ASC</option>
29+
<option value="d.id DESC">JGRID_HEADING_ID_DESC</option>
30+
<option value="project_title ASC">COM_SWJPROJECTS_PROJECT_ASC</option>
31+
<option value="project_title DESC">COM_SWJPROJECTS_PROJECT_DESC</option>
32+
<option value="d.state ASC">JSTATUS_ASC</option>
33+
<option value="d.state DESC">JSTATUS_DESC</option>
34+
</field>
35+
<field name="limit"
36+
type="limitbox"
37+
default="25"
38+
onchange="this.form.submit();"/>
39+
</fields>
3640
</form>

‎com_swjprojects/admin/src/Field/CategoriesField.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,18 @@ protected function getOptions()
5555
{
5656
$db = Factory::getContainer()->get(DatabaseInterface::class);
5757
$query = $db->getQuery(true)
58-
->select(array('c.id', 'c.parent_id', 'c.level'))
58+
->select(['c.id', 'c.parent_id', 'c.level'])
5959
->from($db->quoteName('#__swjprojects_categories', 'c'))
6060
->where($db->quoteName('c.alias') . '!=' . $db->quote('root'));
6161

6262
// Join over translates
63-
$translate = TranslationHelper::getDefault();
64-
$query->select(array('t_c.title as title'))
63+
$translate = TranslationHelper::getCurrent() ?? TranslationHelper::getDefault();
64+
$query->select(['t_c.title as title'])
6565
->leftJoin($db->quoteName('#__swjprojects_translate_categories', 't_c')
6666
. ' ON t_c.id = c.id AND ' . $db->quoteName('t_c.language') . ' = ' . $db->quote($translate));
6767

6868
// Group by
69-
$query->group(array('c.id'));
69+
$query->group(['c.id']);
7070

7171
// Add the list ordering clause
7272
$query->order($db->escape('c.lft') . ' ' . $db->escape('asc'));

‎com_swjprojects/admin/src/Field/DocumentationField.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ protected function getOptions()
5757
->from($db->quoteName('#__swjprojects_documentation', 'd'));
5858

5959
// Join over translates
60-
$translate = TranslationHelper::getDefault();
60+
$translate = TranslationHelper::getCurrent() ?? TranslationHelper::getDefault();
6161
$query->select(['t_d.title as title'])
6262
->leftJoin($db->quoteName('#__swjprojects_translate_documentation', 't_d')
6363
. ' ON t_d.id = d.id AND ' . $db->quoteName('t_d.language') . ' = ' . $db->quote($translate));

‎com_swjprojects/admin/src/Field/ProjectsField.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,17 @@ protected function getOptions()
5454
{
5555
$db = Factory::getContainer()->get(DatabaseInterface::class);
5656
$query = $db->getQuery(true)
57-
->select(array('p.id', 'p.element'))
57+
->select(['p.id', 'p.element'])
5858
->from($db->quoteName('#__swjprojects_projects', 'p'));
5959

6060
// Join over translates
61-
$translate = TranslationHelper::getDefault();
62-
$query->select(array('t_p.title as title'))
61+
$translate = TranslationHelper::getCurrent() ?? TranslationHelper::getDefault();
62+
$query->select(['t_p.title as title'])
6363
->leftJoin($db->quoteName('#__swjprojects_translate_projects', 't_p')
6464
. ' ON t_p.id = p.id AND ' . $db->quoteName('t_p.language') . ' = ' . $db->quote($translate));
6565

6666
// Group by
67-
$query->group(array('p.id'));
67+
$query->group(['p.id']);
6868

6969
// Add the list ordering clause
7070
$query->order($db->escape('p.ordering') . ' ' . $db->escape('asc'));

‎com_swjprojects/admin/src/Field/VersionsField.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,16 @@ protected function getOptions()
5353
{
5454
$db = Factory::getContainer()->get(DatabaseInterface::class);
5555
$query = $db->getQuery(true)
56-
->select(array('v.id', 'v.major', 'v.minor', ' v.patch', 'v.tag', 'v.stage'))
56+
->select(['v.id', 'v.major', 'v.minor', ' v.patch', 'v.tag', 'v.stage'])
5757
->from($db->quoteName('#__swjprojects_versions', 'v'));
5858

5959
// Join over the projects
60-
$query->select(array('p.element as project_element'))
60+
$query->select(['p.element as project_element'])
6161
->leftJoin($db->quoteName('#__swjprojects_projects', 'p') . ' ON p.id = v.project_id');
6262

6363
// Join over translates
64-
$translate = TranslationHelper::getDefault();
65-
$query->select(array('t_p.title as project_title'))
64+
$translate = TranslationHelper::getCurrent() ?? TranslationHelper::getDefault();
65+
$query->select(['t_p.title as project_title'])
6666
->leftJoin($db->quoteName('#__swjprojects_translate_projects', 't_p')
6767
. ' ON t_p.id = p.id AND ' . $db->quoteName('t_p.language') . ' = ' . $db->quote($translate));
6868

0 commit comments

Comments
 (0)