Skip to content
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

Jump to bottom

Changed none selected to none, to be used when there are none availab… #19977

Merged
merged 11 commits into from
Apr 7, 2018
Merged

Changed none selected to none, to be used when there are none availab… #19977

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2cb815c
Changed none selected to none, to be used when there are none availab…
Mar 24, 2018
b281284
Update plugins.php
tonypartridge Mar 24, 2018
0dbff98
Update plugins.php
tonypartridge Mar 24, 2018
24d734c
Update en-GB.ini
tonypartridge Mar 27, 2018
e0b28b6
Update en-GB.ini
tonypartridge Mar 27, 2018
bd03d3e
Update plugins.php
tonypartridge Mar 27, 2018
a86a205
Update plugins.php
tonypartridge Mar 28, 2018
3b51282
Update plugins.php
tonypartridge Mar 28, 2018
2e87f79
Update plugins.php
tonypartridge Mar 28, 2018
04ef9f7
Update plugins.php
tonypartridge Apr 2, 2018
b82fdbb
Update plugins.php
tonypartridge Apr 5, 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: 1 addition & 1 deletion administrator/language/en-GB/en-GB.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,7 +863,7 @@ JOPTION_ACCESS_SHOW_ALL_LEVELS="Show All Access Levels"
JOPTION_ALL_CATEGORIES="- All Categories -"
JOPTION_ANY_CATEGORY="Any Category"
JOPTION_ANY="Any"
JOPTION_DO_NOT_USE="- None Selected -"
JOPTION_DO_NOT_USE="- None -"
JOPTION_FROM_COMPONENT="---From Component---"
JOPTION_FROM_MODULE="---From Module---"
JOPTION_FROM_TEMPLATE="---From %s Template---"
Expand Down
2 changes: 1 addition & 1 deletion language/en-GB/en-GB.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ JLIB_DATABASE_ERROR_DATABASE_CONNECT="Could not connect to database"
JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Unable to load Database Driver: %s"
JLIB_ERROR_INFINITE_LOOP="Infinite loop detected in JError"

JOPTION_DO_NOT_USE="- None Selected -"
JOPTION_DO_NOT_USE="- None -"
JOPTION_SELECT_ACCESS="- Select Access -"
JOPTION_SELECT_AUTHOR="- Select Author -"
JOPTION_SELECT_CATEGORY="- Select Category -"
Expand Down
17 changes: 17 additions & 0 deletions libraries/joomla/form/fields/plugins.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,4 +157,21 @@ protected function getOptions()

return array_merge($parentOptions, $options);
}

/**
* Method to get the field input markup for a generic list.
* Use the multiple attribute to enable multiselect.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove or update?

*
* @return string The field input markup.
*
* @since __DEPLOY_VERSION__
*/
protected function getInput()
{

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove blank line.

if (count($this->options) === 1 && $this->options[0]->text === JText::_('JOPTION_DO_NOT_USE')) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move { to its own line.

$this->readonly = true;
}
return parent::getInput();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add blank line above.

}
}