Skip to content

[Site Modules] Manifest file filters, part 1 #20845

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

Merged
merged 2 commits into from
Jun 29, 2018
Merged

[Site Modules] Manifest file filters, part 1 #20845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a1ab88
[Modules] Manifest file filters
SharkyKZ Jun 22, 2018
b84cc0b
Chosen placeholders
SharkyKZ Jun 23, 2018
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
2 changes: 2 additions & 0 deletions administrator/components/com_modules/views/module/tmpl/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
JHtml::_('formbehavior.chosen', '#jform_position', null, array('disable_search_threshold' => 0 ));
JHtml::_('formbehavior.chosen', '.multipleCategories', null, array('placeholder_text_multiple' => JText::_('JOPTION_SELECT_CATEGORY')));
JHtml::_('formbehavior.chosen', '.multipleTags', null, array('placeholder_text_multiple' => JText::_('JOPTION_SELECT_TAG')));
JHtml::_('formbehavior.chosen', '.multipleAuthors', null, array('placeholder_text_multiple' => JText::_('JOPTION_SELECT_AUTHOR')));
JHtml::_('formbehavior.chosen', '.multipleAuthorAliases', null, array('placeholder_text_multiple' => JText::_('JOPTION_SELECT_AUTHOR_ALIAS')));
JHtml::_('formbehavior.chosen', 'select');

$hasContent = empty($this->item->module) || isset($this->item->xml->customContent);
Expand Down
3 changes: 3 additions & 0 deletions modules/mod_articles_archive/mod_articles_archive.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
label="MOD_ARTICLES_ARCHIVE_FIELD_COUNT_LABEL"
description="MOD_ARTICLES_ARCHIVE_FIELD_COUNT_DESC"
default="10"
filter="integer"
/>
</fieldset>

Expand All @@ -53,6 +54,7 @@
label="COM_MODULES_FIELD_CACHING_LABEL"
description="COM_MODULES_FIELD_CACHING_DESC"
default="1"
filter="integer"
>
<option value="1">JGLOBAL_USE_GLOBAL</option>
<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
Expand All @@ -64,6 +66,7 @@
label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
description="COM_MODULES_FIELD_CACHE_TIME_DESC"
default="900"
filter="integer"
/>

<field
Expand Down
9 changes: 9 additions & 0 deletions modules/mod_articles_categories/mod_articles_categories.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
label="MOD_ARTICLES_CATEGORIES_FIELD_PARENT_LABEL"
description="MOD_ARTICLES_CATEGORIES_FIELD_PARENT_DESC"
extension="com_content"
filter="integer"
published=""
required="true"
select="true"
Expand All @@ -45,6 +46,7 @@
description="MOD_ARTICLES_CATEGORIES_FIELD_SHOW_DESCRIPTION_DESC"
class="btn-group btn-group-yesno"
default="0"
filter="integer"
>
<option value="1">JYES</option>
<option value="0">JNO</option>
Expand All @@ -57,6 +59,7 @@
description="MOD_ARTICLES_CATEGORIES_FIELD_NUMITEMS_DESC"
class="btn-group btn-group-yesno"
default="0"
filter="integer"
>
<option value="1">JYES</option>
<option value="0">JNO</option>
Expand All @@ -69,6 +72,7 @@
description="MOD_ARTICLES_CATEGORIES_FIELD_SHOW_CHILDREN_DESC"
class="btn-group btn-group-yesno"
default="0"
filter="integer"
>
<option value="1">JYES</option>
<option value="0">JNO</option>
Expand All @@ -80,6 +84,7 @@
label="MOD_ARTICLES_CATEGORIES_FIELD_COUNT_LABEL"
description="MOD_ARTICLES_CATEGORIES_FIELD_COUNT_DESC"
default="0"
filter="integer"
>
<option value="0">JALL</option>
<option value="1">J1</option>
Expand All @@ -100,6 +105,7 @@
label="MOD_ARTICLES_CATEGORIES_FIELD_MAXLEVEL_LABEL"
description="MOD_ARTICLES_CATEGORIES_FIELD_MAXLEVEL_DESC"
default="0"
filter="integer"
>
<option value="0">JALL</option>
<option value="1">J1</option>
Expand Down Expand Up @@ -129,6 +135,7 @@
label="MOD_ARTICLES_CATEGORIES_TITLE_HEADING_LABEL"
description="MOD_ARTICLES_CATEGORIES_TITLE_HEADING_DESC"
default="4"
filter="integer"
>
<option value="1">JH1</option>
<option value="2">JH2</option>
Expand All @@ -151,6 +158,7 @@
label="COM_MODULES_FIELD_CACHING_LABEL"
description="COM_MODULES_FIELD_CACHING_DESC"
default="1"
filter="integer"
>
<option value="1">JGLOBAL_USE_GLOBAL</option>
<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
Expand All @@ -162,6 +170,7 @@
label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
description="COM_MODULES_FIELD_CACHE_TIME_DESC"
default="900"
filter="integer"
/>
</fieldset>
</fields>
Expand Down
4 changes: 2 additions & 2 deletions modules/mod_articles_category/helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,9 @@ public static function getList(&$params)
$articles->setState('filter.tag', $params->get('filter_tag', array()));

$articles->setState('filter.featured', $params->get('show_front', 'show'));
$articles->setState('filter.author_id', $params->get('created_by', ''));
$articles->setState('filter.author_id', $params->get('created_by', array()));
$articles->setState('filter.author_id.include', $params->get('author_filtering_type', 1));
$articles->setState('filter.author_alias', $params->get('created_by_alias', ''));
$articles->setState('filter.author_alias', $params->get('created_by_alias', array()));
$articles->setState('filter.author_alias.include', $params->get('author_alias_filtering_type', 1));
$excluded_articles = $params->get('excluded_articles', '');

Expand Down
60 changes: 34 additions & 26 deletions modules/mod_articles_category/mod_articles_category.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
description="MOD_ARTICLES_CATEGORY_FIELD_SHOWONARTICLEPAGE_DESC"
class="btn-group btn-group-yesno"
default="1"
filter="integer"
>
<option value="1">JSHOW</option>
<option value="0">JHIDE</option>
Expand All @@ -63,6 +64,7 @@
label="MOD_ARTICLES_CATEGORY_FIELD_COUNT_LABEL"
description="MOD_ARTICLES_CATEGORY_FIELD_COUNT_DESC"
default="0"
filter="integer"
/>

<field
Expand Down Expand Up @@ -90,6 +92,7 @@
description="MOD_ARTICLES_CATEGORY_FIELD_CATFILTERINGTYPE_DESC"
class="btn-group btn-group-yesno"
default="1"
filter="integer"
>
<option value="1">MOD_ARTICLES_CATEGORY_OPTION_INCLUSIVE_VALUE</option>
<option value="0">MOD_ARTICLES_CATEGORY_OPTION_EXCLUSIVE_VALUE</option>
Expand All @@ -102,18 +105,18 @@
description="MOD_ARTICLES_CATEGORY_FIELD_CATEGORY_DESC"
extension="com_content"
multiple="true"
size="5"
>
<option value="">JOPTION_ALL_CATEGORIES</option>
</field>
filter="int_array"
class="multipleCategories"
/>

<field
name="show_child_category_articles"
type="radio"
label="MOD_ARTICLES_CATEGORY_FIELD_SHOWCHILDCATEGORYARTICLES_LABEL"
description="MOD_ARTICLES_CATEGORY_FIELD_SHOWCHILDCATEGORYARTICLES_DESC"
class="btn-group btn-group-yesno"
default="0"
filter="integer"
class="btn-group btn-group-yesno"
>
<option value="1">MOD_ARTICLES_CATEGORY_OPTION_INCLUDE_VALUE</option>
<option value="0">MOD_ARTICLES_CATEGORY_OPTION_EXCLUDE_VALUE</option>
Expand All @@ -125,6 +128,7 @@
label="MOD_ARTICLES_CATEGORY_FIELD_CATDEPTH_LABEL"
description="MOD_ARTICLES_CATEGORY_FIELD_CATDEPTH_DESC"
default="1"
filter="integer"
/>

<field
Expand All @@ -140,6 +144,7 @@
description="JTAG_FIELD_SELECT_DESC"
mode="nested"
multiple="true"
filter="int_array"
class="multipleTags"
/>

Expand All @@ -156,24 +161,21 @@
description="MOD_ARTICLES_CATEGORY_FIELD_AUTHORFILTERING_DESC"
class="btn-group btn-group-yesno"
default="1"
filter="integer"
>
<option value="1">MOD_ARTICLES_CATEGORY_OPTION_INCLUSIVE_VALUE</option>
<option value="0">MOD_ARTICLES_CATEGORY_OPTION_EXCLUSIVE_VALUE</option>
</field>

<field
name="created_by"
type="sql"
type="author"
label="MOD_ARTICLES_CATEGORY_FIELD_AUTHOR_LABEL"
description="MOD_ARTICLES_CATEGORY_FIELD_AUTHOR_DESC"
multiple="true"
size="5"
query="select id, name, username from #__users where id IN (select distinct(created_by) from #__content) order by name ASC"
key_field="id"
value_field="name"
>
<option value="">JOPTION_SELECT_AUTHORS</option>
</field>
filter="int_array"
class="multipleAuthors"
/>

<field
name="filteringspacer3"
Expand All @@ -188,6 +190,7 @@
description="MOD_ARTICLES_CATEGORY_FIELD_AUTHORALIASFILTERING_DESC"
class="btn-group btn-group-yesno"
default="1"
filter="integer"
>
<option value="1">MOD_ARTICLES_CATEGORY_OPTION_INCLUSIVE_VALUE</option>
<option value="0">MOD_ARTICLES_CATEGORY_OPTION_EXCLUSIVE_VALUE</option>
Expand All @@ -199,13 +202,11 @@
label="MOD_ARTICLES_CATEGORY_FIELD_AUTHORALIAS_LABEL"
description="MOD_ARTICLES_CATEGORY_FIELD_AUTHORALIAS_DESC"
multiple="true"
size="5"
query="select distinct(created_by_alias) from #__content where created_by_alias != '' order by created_by_alias ASC"
key_field="created_by_alias"
value_field="created_by_alias"
>
<option value="">JOPTION_SELECT_AUTHOR_ALIASES</option>
</field>
class="multipleAuthorAliases"
/>

<field
name="filteringspacer4"
Expand Down Expand Up @@ -247,15 +248,9 @@
description="MOD_ARTICLES_CATEGORY_FIELD_DATERANGEFIELD_DESC"
default="a.created"
>
<option value="a.created">
MOD_ARTICLES_CATEGORY_OPTION_CREATED_VALUE
</option>
<option value="a.modified">
MOD_ARTICLES_CATEGORY_OPTION_MODIFIED_VALUE
</option>
<option value="a.publish_up">
MOD_ARTICLES_CATEGORY_OPTION_STARTPUBLISHING_VALUE
</option>
<option value="a.created">MOD_ARTICLES_CATEGORY_OPTION_CREATED_VALUE</option>
<option value="a.modified">MOD_ARTICLES_CATEGORY_OPTION_MODIFIED_VALUE</option>
<option value="a.publish_up">MOD_ARTICLES_CATEGORY_OPTION_STARTPUBLISHING_VALUE</option>
</field>

<field
Expand Down Expand Up @@ -286,6 +281,7 @@
label="MOD_ARTICLES_CATEGORY_FIELD_RELATIVEDATE_LABEL"
description="MOD_ARTICLES_CATEGORY_FIELD_RELATIVEDATE_DESC"
default="30"
filter="integer"
/>

</fieldset>
Expand Down Expand Up @@ -379,6 +375,7 @@
label="MOD_ARTICLES_CATEGORY_FIELD_LINKTITLES_LABEL"
description="MOD_ARTICLES_CATEGORY_FIELD_LINKTITLES_DESC"
default="1"
filter="integer"
class="btn-group btn-group-yesno"
>
<option value="1">JYES</option>
Expand All @@ -391,6 +388,7 @@
label="JDATE"
description="MOD_ARTICLES_CATEGORY_FIELD_SHOWDATE_DESC"
default="0"
filter="integer"
class="btn-group btn-group-yesno"
>
<option value="1">JSHOW</option>
Expand Down Expand Up @@ -423,6 +421,7 @@
label="JCATEGORY"
description="MOD_ARTICLES_CATEGORY_FIELD_SHOWCATEGORY_DESC"
default="0"
filter="integer"
class="btn-group btn-group-yesno"
>
<option value="1">JSHOW</option>
Expand All @@ -435,6 +434,7 @@
label="MOD_ARTICLES_CATEGORY_FIELD_SHOWHITS_LABEL"
description="MOD_ARTICLES_CATEGORY_FIELD_SHOWHITS_DESC"
default="0"
filter="integer"
class="btn-group btn-group-yesno"
>
<option value="1">JSHOW</option>
Expand All @@ -447,6 +447,7 @@
label="JAUTHOR"
description="MOD_ARTICLES_CATEGORY_FIELD_SHOWAUTHOR_DESC"
default="0"
filter="integer"
class="btn-group btn-group-yesno"
>
<option value="1">JSHOW</option>
Expand All @@ -459,6 +460,7 @@
label="MOD_ARTICLES_CATEGORY_FIELD_SHOWINTROTEXT_LABEL"
description="MOD_ARTICLES_CATEGORY_FIELD_SHOWINTROTEXT_DESC"
default="0"
filter="integer"
class="btn-group btn-group-yesno"
>
<option value="1">JSHOW</option>
Expand All @@ -471,6 +473,7 @@
label="MOD_ARTICLES_CATEGORY_FIELD_INTROTEXTLIMIT_LABEL"
description="MOD_ARTICLES_CATEGORY_FIELD_INTROTEXTLIMIT_DESC"
default="100"
filter="integer"
/>

<field
Expand All @@ -479,6 +482,7 @@
label="JGLOBAL_SHOW_READMORE_LABEL"
description="JGLOBAL_SHOW_READMORE_DESC"
default="0"
filter="integer"
class="btn-group btn-group-yesno"
>
<option value="1">JSHOW</option>
Expand All @@ -491,6 +495,7 @@
label="JGLOBAL_SHOW_READMORE_TITLE_LABEL"
description="JGLOBAL_SHOW_READMORE_TITLE_DESC"
default="1"
filter="integer"
class="btn-group btn-group-yesno"
>
<option value="1">JSHOW</option>
Expand All @@ -503,6 +508,7 @@
label="JGLOBAL_SHOW_READMORE_LIMIT_LABEL"
description="JGLOBAL_SHOW_READMORE_LIMIT_DESC"
default="15"
filter="integer"
/>

</fieldset>
Expand Down Expand Up @@ -530,6 +536,7 @@
label="COM_MODULES_FIELD_CACHING_LABEL"
description="COM_MODULES_FIELD_CACHING_DESC"
default="1"
filter="integer"
>
<option value="1">JGLOBAL_USE_GLOBAL</option>
<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
Expand All @@ -541,6 +548,7 @@
label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
description="COM_MODULES_FIELD_CACHE_TIME_DESC"
default="900"
filter="integer"
/>
</fieldset>
</fields>
Expand Down
4 changes: 2 additions & 2 deletions modules/mod_articles_latest/helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@ public static function getList(&$params)
// Featured switch
switch ($params->get('show_featured'))
{
case '1' :
case 1 :
$model->setState('filter.featured', 'only');
break;
case '0' :
case 0 :
$model->setState('filter.featured', 'hide');
break;
default :
Expand Down
Loading