Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/4.3-dev' into fix_ldap_ssl
Browse files Browse the repository at this point in the history
  • Loading branch information
tatankat committed Jan 30, 2023
2 parents 3f3ca23 + 5d14d67 commit f36071b
Show file tree
Hide file tree
Showing 107 changed files with 984 additions and 592 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,23 @@
name="extension"
type="extension"
label="COM_ACTIONLOGS_EXTENSION"
onchange="this.form.submit()"
class="js-select-submit-on-change"
>
<option value="">COM_ACTIONLOGS_SELECT_EXTENSION</option>
</field>
<field
name="dateRange"
type="logsdaterange"
label="COM_ACTIONLOGS_DATE"
onchange="this.form.submit();"
class="js-select-submit-on-change"
>
<option value="">COM_ACTIONLOGS_OPTION_FILTER_DATE</option>
</field>
<field
name="user"
type="logcreator"
label="COM_ACTIONLOGS_NAME"
onchange="this.form.submit();"
class="js-select-submit-on-change"
>
<option value="">COM_ACTIONLOGS_SELECT_USER</option>
</field>
Expand All @@ -39,7 +39,7 @@
name="fullordering"
type="list"
label="JGLOBAL_SORT_BY"
onchange="this.form.submit();"
class="js-select-submit-on-change"
default="a.id DESC"
validate="options"
>
Expand All @@ -61,8 +61,7 @@
name="limit"
type="limitbox"
label="JGLOBAL_LIST_LIMIT"
class="input-mini"
onchange="this.form.submit();"
class="input-mini js-select-submit-on-change"
default="25"
/>
</fields>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
type="contentlanguage"
label="COM_ASSOCIATIONS_FILTER_SELECT_LANGUAGE"
filtermode="selector"
onchange="this.form.submit();"
class="js-select-submit-on-change"
>
<option value="">JOPTION_SELECT_LANGUAGE</option>
</field>
Expand All @@ -34,7 +34,7 @@
name="state"
type="status"
label="JSTATUS"
onchange="this.form.submit();"
class="js-select-submit-on-change"
>
<option value="">JOPTION_SELECT_PUBLISHED</option>
</field>
Expand All @@ -45,7 +45,7 @@
label="JCATEGORY"
published="0,1,2"
extension="dynamic"
onchange="this.form.submit();"
class="js-select-submit-on-change"
>
<option value="">JOPTION_SELECT_CATEGORY</option>
</field>
Expand All @@ -55,7 +55,7 @@
type="menu"
label="COM_ASSOCIATIONS_HEADING_MENUTYPE"
clientid="0"
onchange="this.form.submit();"
class="js-select-submit-on-change"
>
<option value="">COM_ASSOCIATIONS_SELECT_MENU</option>
</field>
Expand All @@ -64,7 +64,7 @@
name="access"
type="accesslevel"
label="JGRID_HEADING_ACCESS"
onchange="this.form.submit();"
class="js-select-submit-on-change"
>
<option value="">JOPTION_SELECT_ACCESS</option>
</field>
Expand All @@ -76,7 +76,7 @@
first="1"
last="10"
step="1"
onchange="this.form.submit();"
class="js-select-submit-on-change"
>
<option value="">JOPTION_SELECT_MAX_LEVELS</option>
</field>
Expand All @@ -88,7 +88,7 @@
type="list"
label="JGLOBAL_SORT_BY"
default="id ASC"
onchange="this.form.submit();"
class="js-select-submit-on-change"
validate="options"
>
<option value="">JGLOBAL_SORT_BY</option>
Expand All @@ -107,7 +107,7 @@
type="limitbox"
label="JGLOBAL_LIST_LIMIT"
default="25"
onchange="this.form.submit();"
class="js-select-submit-on-change"
/>
</fields>
</form>
14 changes: 7 additions & 7 deletions administrator/components/com_banners/forms/filter_banners.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
name="published"
type="status"
label="JSTATUS"
onchange="this.form.submit();"
class="js-select-submit-on-change"
>
<option value="">JOPTION_SELECT_PUBLISHED</option>
</field>
Expand All @@ -24,7 +24,7 @@
type="category"
label="JCATEGORY"
extension="com_banners"
onchange="this.form.submit();"
class="js-select-submit-on-change"
addfieldprefix="Joomla\Component\Categories\Administrator\Field"
>
<option value="">JOPTION_SELECT_CATEGORY</option>
Expand All @@ -35,7 +35,7 @@
type="bannerclient"
label="COM_BANNERS_HEADING_CLIENT"
extension="com_content"
onchange="this.form.submit();"
class="js-select-submit-on-change"
>
<option value="">COM_BANNERS_SELECT_CLIENT</option>
</field>
Expand All @@ -44,7 +44,7 @@
name="language"
type="contentlanguage"
label="JGRID_HEADING_LANGUAGE"
onchange="this.form.submit();"
class="js-select-submit-on-change"
>
<option value="">JOPTION_SELECT_LANGUAGE</option>
<option value="*">JALL</option>
Expand All @@ -58,7 +58,7 @@
last="10"
step="1"
languages="*"
onchange="this.form.submit();"
class="js-select-submit-on-change"
>
<option value="">JOPTION_SELECT_MAX_LEVELS</option>
</field>
Expand All @@ -69,7 +69,7 @@
type="list"
label="JGLOBAL_SORT_BY"
statuses="*,0,1,2,-2"
onchange="this.form.submit();"
class="js-select-submit-on-change"
default="a.name ASC"
validate="options"
>
Expand Down Expand Up @@ -101,7 +101,7 @@
type="limitbox"
label="JGLOBAL_LIST_LIMIT"
default="25"
onchange="this.form.submit();"
class="js-select-submit-on-change"
/>
</fields>
</form>
8 changes: 4 additions & 4 deletions administrator/components/com_banners/forms/filter_clients.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
name="state"
type="status"
label="JSTATUS"
onchange="this.form.submit();"
class="js-select-submit-on-change"
>
<option value="">JOPTION_SELECT_PUBLISHED</option>
</field>
Expand All @@ -24,7 +24,7 @@
type="list"
label="COM_BANNERS_HEADING_TYPE"
default="0"
onchange="this.form.submit();"
class="js-select-submit-on-change"
validate="options"
>
<option value="">COM_BANNERS_SELECT_TYPE</option>
Expand All @@ -41,7 +41,7 @@
type="list"
label="JGLOBAL_SORT_BY"
statuses="*,0,1,2,-2"
onchange="this.form.submit();"
class="js-select-submit-on-change"
default="a.name ASC"
validate="options"
>
Expand All @@ -63,7 +63,7 @@
type="limitbox"
label="JGLOBAL_LIST_LIMIT"
default="25"
onchange="this.form.submit();"
class="js-select-submit-on-change"
/>
</fields>
</form>
16 changes: 8 additions & 8 deletions administrator/components/com_banners/forms/filter_tracks.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
type="category"
label="JCATEGORY"
extension="com_banners"
onchange="this.form.submit();"
class="js-select-submit-on-change"
addfieldprefix="Joomla\Component\Categories\Administrator\Field"
>
<option value="">JOPTION_SELECT_CATEGORY</option>
Expand All @@ -26,7 +26,7 @@
type="bannerclient"
label="COM_BANNERS_HEADING_CLIENT"
extension="com_content"
onchange="this.form.submit();"
class="js-select-submit-on-change"
>
<option value="">COM_BANNERS_SELECT_CLIENT</option>
</field>
Expand All @@ -35,7 +35,7 @@
name="type"
type="list"
label="COM_BANNERS_HEADING_TYPE"
onchange="this.form.submit();"
class="js-select-submit-on-change"
validate="options"
>
<option value="">COM_BANNERS_SELECT_TYPE</option>
Expand All @@ -51,7 +51,7 @@
last="10"
step="1"
languages="*"
onchange="this.form.submit();"
class="js-select-submit-on-change"
>
<option value="">JOPTION_SELECT_MAX_LEVELS</option>
</field>
Expand All @@ -63,7 +63,7 @@
hint="COM_BANNERS_BEGIN_HINT"
format="%Y-%m-%d"
filter="user_utc"
onchange="this.form.submit();"
class="js-select-submit-on-change"
/>

<field
Expand All @@ -73,15 +73,15 @@
hint="COM_BANNERS_END_HINT"
format="%Y-%m-%d"
filter="user_utc"
onchange="this.form.submit();"
class="js-select-submit-on-change"
/>
</fields>
<fields name="list">
<field
name="fullordering"
type="list"
label="JGLOBAL_SORT_BY"
onchange="this.form.submit();"
class="js-select-submit-on-change"
default="b.name ASC"
validate="options"
>
Expand All @@ -103,7 +103,7 @@
type="limitbox"
label="JGLOBAL_LIST_LIMIT"
default="5"
onchange="this.form.submit();"
class="js-select-submit-on-change"
/>
</fields>
</form>
4 changes: 2 additions & 2 deletions administrator/components/com_cache/forms/filter_cache.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
name="fullordering"
type="list"
label="JGLOBAL_SORT_BY"
onchange="this.form.submit();"
class="js-select-submit-on-change"
default="group ASC"
validate="options"
>
Expand All @@ -33,7 +33,7 @@
type="limitbox"
label="JGLOBAL_LIST_LIMIT"
default="25"
onchange="this.form.submit();"
class="js-select-submit-on-change"
/>
</fields>
</form>
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
name="published"
type="status"
label="JSTATUS"
onchange="this.form.submit();"
class="js-select-submit-on-change"
>
<option value="">JOPTION_SELECT_PUBLISHED</option>
</field>
Expand All @@ -25,7 +25,7 @@
name="access"
type="accesslevel"
label="JGRID_HEADING_ACCESS"
onchange="this.form.submit();"
class="js-select-submit-on-change"
>
<option value="">JOPTION_SELECT_ACCESS</option>
</field>
Expand All @@ -34,7 +34,7 @@
name="language"
type="contentlanguage"
label="JGRID_HEADING_LANGUAGE"
onchange="this.form.submit();"
class="js-select-submit-on-change"
>
<option value="">JOPTION_SELECT_LANGUAGE</option>
<option value="*">JALL</option>
Expand All @@ -48,7 +48,7 @@
multiple="true"
mode="nested"
custom="false"
onchange="this.form.submit();"
class="js-select-submit-on-change"
/>

<field
Expand All @@ -59,7 +59,7 @@
last="10"
step="1"
languages="*"
onchange="this.form.submit();"
class="js-select-submit-on-change"
>
<option value="">JOPTION_SELECT_MAX_LEVELS</option>
</field>
Expand All @@ -73,7 +73,7 @@
label="JGLOBAL_SORT_BY"
default="a.lft ASC"
statuses="*,0,1,2,-2"
onchange="this.form.submit();"
class="js-select-submit-on-change"
validate="options"
>
<option value="">JGLOBAL_SORT_BY</option>
Expand All @@ -98,7 +98,7 @@
type="limitbox"
label="JGLOBAL_LIST_LIMIT"
default="25"
onchange="this.form.submit();"
class="js-select-submit-on-change"
/>
</fields>
</form>
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@
Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
}

HTMLHelper::_('behavior.core');
/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa->useScript('core');

$extension = $this->escape($this->state->get('filter.extension'));
$function = $app->getInput()->getCmd('function', 'jSelectCategory');
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_checkin/forms/filter_checkin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
name="fullordering"
type="list"
label="JGLOBAL_SORT_BY"
onchange="this.form.submit();"
class="js-select-submit-on-change"
default="table ASC"
validate="options"
>
Expand All @@ -31,7 +31,7 @@
type="limitbox"
label="JGLOBAL_LIST_LIMIT"
default="5"
onchange="this.form.submit();"
class="js-select-submit-on-change"
/>
</fields>
</form>

0 comments on commit f36071b

Please sign in to comment.