Skip to content

[4.0] Articles List Layout vote/ratings fields xml should not be switchers #31381

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
richard67 merged 5 commits into from
Nov 14, 2020
Merged

[4.0] Articles List Layout vote/ratings fields xml should not be switchers #31381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3502c81
[4.0] Articles List Layout vote/ratings fields xml are not a switcher
infograf768 Nov 11, 2020
26f79f3
do not display vote fields when plugin is disabled
infograf768 Nov 12, 2020
24d358b
use DEPLOY_VERSION
infograf768 Nov 12, 2020
43062f7
Votelist Field class.
infograf768 Nov 12, 2020
ab8b009
Preventing display of voting field in Articles tab global Options when
infograf768 Nov 12, 2020
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: 1 addition & 1 deletion administrator/components/com_content/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@

<field
name="show_vote"
type="radio"
type="voteradio"
label="JGLOBAL_SHOW_VOTE_LABEL"
layout="joomla.form.field.radio.switcher"
default="0"
Expand Down
55 changes: 55 additions & 0 deletions administrator/components/com_content/src/Field/VotelistField.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?php
/**
* @package Joomla.Administrator
* @subpackage com_content
*
* @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

namespace Joomla\Component\Content\Administrator\Field;

\defined('_JEXEC') or die;

use Joomla\CMS\Form\Field\ListField;
use Joomla\CMS\Plugin\PluginHelper;

/**
* Votelist Field class.
*
* @since __DEPLOY_VERSION__
*/
class VotelistField extends ListField
{
/**
* The form field type.
*
* @var string
* @since __DEPLOY_VERSION__
*/
protected $type = 'Votelist';

/**
* Method to attach a form object to the field.
*
* @param \SimpleXMLElement $element The SimpleXMLElement object representing the `<field>` tag for the form field object.
* @param mixed $value The form field value to validate.
* @param string $group The field name group control value. This acts as as an array container for the field.
* For example if the field has name="foo" and the group value is set to "bar" then the
* full field name would end up being "bar[foo]".
*
* @return boolean True on success.
*
* @since __DEPLOY_VERSION__
*/
public function setup(\SimpleXMLElement $element, $value, $group = null)
{
// Requires vote plugin enabled
if (!PluginHelper::isEnabled('content', 'vote'))
{
return false;
}

return parent::setup($element, $value, $group);
}
}
12 changes: 7 additions & 5 deletions components/com_content/tmpl/category/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,9 @@

</fieldset>

<fieldset name="advanced" label="JGLOBAL_LIST_LAYOUT_OPTIONS">
<fieldset name="advanced" label="JGLOBAL_LIST_LAYOUT_OPTIONS"
addfieldprefix="Joomla\Component\Content\Administrator\Field"
>
<field
name="show_pagination_limit"
type="list"
Expand Down Expand Up @@ -261,10 +263,10 @@

<field
name="list_show_votes"
type="list"
type="votelist"
label="JGLOBAL_LIST_VOTES_LABEL"
layout="joomla.form.field.radio.switcher"
useglobal="true"
class="custom-select-color-state"
validate="options"
>
<option value="0" requires="vote">JHIDE</option>
Expand All @@ -273,10 +275,10 @@

<field
name="list_show_ratings"
type="list"
type="votelist"
label="JGLOBAL_LIST_RATINGS_LABEL"
layout="joomla.form.field.radio.switcher"
useglobal="true"
class="custom-select-color-state"
validate="options"
>
<option value="0" requires="vote">JHIDE</option>
Expand Down