Skip to content

[4.0] Remove duplicate items from list and filtering by language in mail templates list display #26445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

[4.0] Remove duplicate items from list and filtering by language in mail templates list display #26445

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
48c4639
Remove language from result set and group by
richard67 Oct 1, 2019
92d2655
Simplify query
richard67 Oct 1, 2019
534eee7
Remove language filtering.
richard67 Oct 1, 2019
cba4a3d
CS for arrays in TemplatesModel.php
richard67 Oct 2, 2019
4d9a270
No need for implode when calling getState
richard67 Oct 2, 2019
1a4b9a0
Merge branch '4.0-dev-mail-templates-sql-1' of https://github.com/ric…
richard67 Oct 2, 2019
bbf633f
Merge branch '4.0-dev' into 4.0-dev-mail-templates-sql-1
richard67 Oct 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 15 additions & 20 deletions administrator/components/com_mails/Model/TemplatesModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ public function __construct($config = array())
{
$config['filter_fields'] = array(
'template_id', 'a.template_id',
'language', 'a.language',
'subject', 'a.subject',
'body', 'a.body',
'htmlbody', 'a.htmlbody'
Expand Down Expand Up @@ -90,6 +89,7 @@ public function getItems()
->select($db->quoteName('language'))
->from($db->quoteName('#__mail_templates'))
->where($db->quoteName('template_id') . ' = :id')
->where($db->quoteName('language') . ' != ' . $db->quote(''))
->order($db->quoteName('language') . ' ASC')
->bind(':id', $id);

Expand Down Expand Up @@ -120,21 +120,23 @@ protected function getListQuery()
$query->select(
$this->getState(
'list.select',
$db->quoteName('a') . '.*'
implode(
',',
$db->quoteName(
[
'a.template_id',
'a.subject',
'a.body',
'a.htmlbody',
'a.attachments',
'a.params'
]
)
)
)
);
$query->from($db->quoteName('#__mail_templates', 'a'))
->group(
[
$db->quoteName('a.template_id'),
$db->quoteName('a.language'),
$db->quoteName('a.subject'),
$db->quoteName('a.body'),
$db->quoteName('a.htmlbody'),
$db->quoteName('a.attachments'),
$db->quoteName('a.params'),
]
);
->where($db->quoteName('a.language') . ' = ' . $db->quote(''));

// Filter by search in title.
if ($search = trim($this->getState('filter.search')))
Expand Down Expand Up @@ -166,13 +168,6 @@ protected function getListQuery()
->bind(':extension', $extension);
}

// Filter on the language.
if ($language = $this->getState('filter.language'))
{
$query->where($db->quoteName('a.language') . ' = :language')
->bind(':language', $language);
}

return $query;
}

Expand Down
10 changes: 0 additions & 10 deletions administrator/components/com_mails/forms/filter_templates.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,6 @@
hint="JSEARCH_FILTER"
/>

<field
name="language"
type="contentlanguage"
label="JOPTION_SELECT_LANGUAGE"
onchange="this.form.submit();"
>
<option value="">JOPTION_SELECT_LANGUAGE</option>
<option value="*">JALL</option>
</field>

<field
name="extension"
type="sql"
Expand Down