Skip to content

Commit a68459b

Browse files
brianteemanbrianteeman
committed
Merge pull request joomla#18 from joomla/staging
Update from upstream
2 parents 9e1a2c9 + d840da1 commit a68459b

File tree

142 files changed

+984
-552
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+984
-552
lines changed

‎administrator/components/com_banners/models/banners.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ public function __construct($config = array())
4545
'clicks', 'a.clicks',
4646
'publish_up', 'a.publish_up',
4747
'publish_down', 'a.publish_down',
48-
'state', 'sticky', 'a.sticky',
48+
'sticky', 'a.sticky',
4949
'client_id',
5050
'category_id',
51-
'published'
51+
'published',
5252
);
5353
}
5454

@@ -218,7 +218,6 @@ protected function getStoreId($id = '')
218218
{
219219
// Compile the store id.
220220
$id .= ':' . $this->getState('filter.search');
221-
$id .= ':' . $this->getState('filter.access');
222221
$id .= ':' . $this->getState('filter.published');
223222
$id .= ':' . $this->getState('filter.category_id');
224223
$id .= ':' . $this->getState('filter.language');
@@ -258,7 +257,7 @@ protected function populateState($ordering = 'a.name', $direction = 'asc')
258257
{
259258
// Load the filter state.
260259
$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search'));
261-
$this->setState('filter.state', $this->getUserStateFromRequest($this->context . '.filter.state', 'filter_state', '', 'string'));
260+
$this->setState('filter.published', $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '', 'string'));
262261
$this->setState('filter.category_id', $this->getUserStateFromRequest($this->context . '.filter.category_id', 'filter_category_id', ''));
263262
$this->setState('filter.client_id', $this->getUserStateFromRequest($this->context . '.filter.client_id', 'filter_client_id', ''));
264263
$this->setState('filter.language', $this->getUserStateFromRequest($this->context . '.filter.language', 'filter_language', ''));

‎administrator/components/com_banners/models/forms/filter_banners.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@
2929
<option value="">JOPTION_SELECT_CATEGORY</option>
3030
</field>
3131
<field
32-
name="client_id"
33-
type="bannerclient"
34-
label="COM_BANNERS_FILTER_CLIENT"
35-
extension="com_content"
36-
description="COM_BANNERS_FILTER_CLIENT_DESC"
37-
onchange="this.form.submit();"
38-
>
39-
<option value="">COM_BANNERS_SELECT_CLIENT</option>
40-
</field>
32+
name="client_id"
33+
type="bannerclient"
34+
label="COM_BANNERS_FILTER_CLIENT"
35+
extension="com_content"
36+
description="COM_BANNERS_FILTER_CLIENT_DESC"
37+
onchange="this.form.submit();"
38+
>
39+
<option value="">COM_BANNERS_SELECT_CLIENT</option>
40+
</field>
4141
<field
4242
name="language"
4343
type="contentlanguage"

‎administrator/components/com_banners/models/tracks.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ protected function populateState($ordering = 'b.name', $direction = 'asc')
6767
{
6868
// Load the filter state.
6969
$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
70-
$this->setState('filter.category_id', $this->getUserStateFromRequest($this->context . '.filter.category_id', 'filter_category_id', null, 'int'));
71-
$this->setState('filter.client_id', $this->getUserStateFromRequest($this->context . '.filter.client_id', 'filter_client_id', null, 'int'));
72-
$this->setState('filter.type', $this->getUserStateFromRequest($this->context . '.filter.type', 'filter_type', null, 'int'));
70+
$this->setState('filter.category_id', $this->getUserStateFromRequest($this->context . '.filter.category_id', 'filter_category_id', '', 'cmd'));
71+
$this->setState('filter.client_id', $this->getUserStateFromRequest($this->context . '.filter.client_id', 'filter_client_id', '', 'cmd'));
72+
$this->setState('filter.type', $this->getUserStateFromRequest($this->context . '.filter.type', 'filter_type', '', 'cmd'));
7373
$this->setState('filter.begin', $this->getUserStateFromRequest($this->context . '.filter.begin', 'filter_begin', '', 'string'));
7474
$this->setState('filter.end', $this->getUserStateFromRequest($this->context . '.filter.end', 'filter_end', '', 'string'));
7575

‎administrator/components/com_banners/views/banners/tmpl/default.php‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
$listOrder = $this->escape($this->state->get('list.ordering'));
2121
$listDirn = $this->escape($this->state->get('list.direction'));
2222
$canOrder = $user->authorise('core.edit.state', 'com_banners.category');
23-
$archived = $this->state->get('filter.state') == 2 ? true : false;
24-
$trashed = $this->state->get('filter.state') == -2 ? true : false;
2523
$saveOrder = $listOrder == 'a.ordering';
2624

2725
if ($saveOrder)
@@ -30,7 +28,6 @@
3028
JHtml::_('sortablelist.sortable', 'articleList', 'adminForm', strtolower($listDirn), $saveOrderingUrl);
3129
}
3230
?>
33-
3431
<form action="<?php echo JRoute::_('index.php?option=com_banners&view=banners'); ?>" method="post" name="adminForm" id="adminForm">
3532
<div id="j-sidebar-container" class="span2">
3633
<?php echo $this->sidebar; ?>
@@ -123,16 +120,13 @@
123120
<td class="center">
124121
<div class="btn-group">
125122
<?php echo JHtml::_('jgrid.published', $item->state, $i, 'banners.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
126-
<?php
127-
// Create dropdown items
128-
$action = $archived ? 'unarchive' : 'archive';
129-
JHtml::_('actionsdropdown.' . $action, 'cb' . $i, 'banners');
130-
131-
$action = $trashed ? 'untrash' : 'trash';
132-
JHtml::_('actionsdropdown.' . $action, 'cb' . $i, 'banners');
133-
134-
// Render dropdown list
135-
echo JHtml::_('actionsdropdown.render', $this->escape($item->name));
123+
<?php // Create dropdown items and render the dropdown list.
124+
if ($canChange)
125+
{
126+
JHtml::_('actionsdropdown.' . ((int) $item->state === 2 ? 'un' : '') . 'archive', 'cb' . $i, 'banners');
127+
JHtml::_('actionsdropdown.' . ((int) $item->state === -2 ? 'un' : '') . 'trash', 'cb' . $i, 'banners');
128+
echo JHtml::_('actionsdropdown.render', $this->escape($item->name));
129+
}
136130
?>
137131
</div>
138132
</td>

‎administrator/components/com_banners/views/clients/tmpl/default.php‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@
2020
$listOrder = $this->escape($this->state->get('list.ordering'));
2121
$listDirn = $this->escape($this->state->get('list.direction'));
2222
$params = (isset($this->state->params)) ? $this->state->params : new JObject;
23-
$archived = $this->state->get('filter.state') == 2 ? true : false;
24-
$trashed = $this->state->get('filter.state') == -2 ? true : false;
2523
?>
26-
2724
<form action="<?php echo JRoute::_('index.php?option=com_banners&view=clients'); ?>" method="post" name="adminForm" id="adminForm">
2825
<div id="j-sidebar-container" class="span2">
2926
<?php echo $this->sidebar; ?>
@@ -85,16 +82,13 @@
8582
<td class="center">
8683
<div class="btn-group">
8784
<?php echo JHtml::_('jgrid.published', $item->state, $i, 'clients.', $canChange); ?>
88-
<?php
89-
// Create dropdown items
90-
$action = $archived ? 'unarchive' : 'archive';
91-
JHtml::_('actionsdropdown.' . $action, 'cb' . $i, 'clients');
92-
93-
$action = $trashed ? 'untrash' : 'trash';
94-
JHtml::_('actionsdropdown.' . $action, 'cb' . $i, 'clients');
95-
96-
// Render dropdown list
97-
echo JHtml::_('actionsdropdown.render', $this->escape($item->name));
85+
<?php // Create dropdown items and render the dropdown list.
86+
if ($canChange)
87+
{
88+
JHtml::_('actionsdropdown.' . ((int) $item->state === 2 ? 'un' : '') . 'archive', 'cb' . $i, 'clients');
89+
JHtml::_('actionsdropdown.' . ((int) $item->state === -2 ? 'un' : '') . 'trash', 'cb' . $i, 'clients');
90+
echo JHtml::_('actionsdropdown.render', $this->escape($item->name));
91+
}
9892
?>
9993
</div>
10094
</td>

‎administrator/components/com_cache/layouts/joomla/searchtools/default.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* @package Joomla.Site
3+
* @package Joomla.Administrator
44
* @subpackage Layout
55
*
66
* @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.

‎administrator/components/com_cache/layouts/joomla/searchtools/default/bar.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* @package Joomla.Site
3+
* @package Joomla.Administrator
44
* @subpackage Layout
55
*
66
* @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.

‎administrator/components/com_cache/models/forms/filter_cache.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<field
1414
name="search"
1515
type="text"
16-
label="JSEARCH_FILTER"
17-
description="JSEARCH_FILTER"
16+
label="COM_CACHE_FILTER_SEARCH_LABEL"
17+
description="COM_CACHE_FILTER_SEARCH_DESC"
1818
hint="JSEARCH_FILTER"
1919
/>
2020
</fields>

‎administrator/components/com_categories/helpers/association.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* @package Joomla.Site
3+
* @package Joomla.Administrator
44
* @subpackage com_categories
55
*
66
* @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.

‎administrator/components/com_categories/models/categories.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ protected function populateState($ordering = 'a.lft', $direction = 'asc')
9393

9494
$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.search', 'filter_search', '', 'string'));
9595
$this->setState('filter.published', $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '', 'string'));
96-
$this->setState('filter.access', $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', null, 'int'));
97-
$this->setState('filter.language', $this->getUserStateFromRequest($this->context . '.filter.language', 'filter_language', '', 'cmd'));
96+
$this->setState('filter.access', $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', '', 'cmd'));
97+
$this->setState('filter.language', $this->getUserStateFromRequest($this->context . '.filter.language', 'filter_language', '', 'string'));
9898
$this->setState('filter.tag', $this->getUserStateFromRequest($this->context . '.filter.tag', 'filter_tag', '', 'string'));
9999
$this->setState('filter.level', $this->getUserStateFromRequest($this->context . '.filter.level', 'filter_level', '', 'string'));
100100

0 commit comments

Comments
 (0)