Fixing a mistake made with PR #24397 + fixing setting description for clarity (#25062)

* Undoing PR #24397 which was a mistake

The PR was adding a check to display the custom field on the frontend based on a parameter that was meant to be a check for the edit form

Author: AndySDH

administrator/components/com_fields/libraries/fieldsplugin.php

@@ -117,12 +117,6 @@ public function onCustomFieldsPrepareField($context, $item, $field)
 			return;
 		}
 
-		// Check if the field should be displayed on the form
-		if (!FieldsHelper::displayFieldOnForm($field))
-		{
-			return;
-		}
-
 		// Merge the params from the plugin and field which has precedence
 		$fieldParams = clone $this->params;
 		$fieldParams->merge($field->fieldparams);

administrator/components/com_fields/models/forms/field.xml

@@ -264,14 +264,14 @@
 			<field
 				name="show_on"
 				type="radio"
-				label="COM_FIELDS_FIELD_SHOW_ON_LABEL"
-				description="COM_FIELDS_FIELD_SHOW_ON_DESC"
+				label="COM_FIELDS_FIELD_EDITABLE_IN_LABEL"
+				description="COM_FIELDS_FIELD_EDITABLE_IN_DESC"
 				class="btn-group btn-group-yesno"
 				default=""
 				>
-				<option value="1">COM_FIELDS_FIELD_SHOW_ON_SITE</option>
-				<option value="2">COM_FIELDS_FIELD_SHOW_ON_ADMIN</option>
-				<option value="">COM_FIELDS_FIELD_SHOW_ON_BOTH</option>
+				<option value="1">COM_FIELDS_FIELD_EDITABLE_IN_SITE</option>
+				<option value="2">COM_FIELDS_FIELD_EDITABLE_IN_ADMIN</option>
+				<option value="">COM_FIELDS_FIELD_EDITABLE_IN_BOTH</option>
 			</field>
 
 			<field

administrator/language/en-GB/en-GB.com_fields.ini

@@ -22,6 +22,11 @@ COM_FIELDS_FIELD_DISPLAY_BEFORE_DISPLAY="Before Display"
 COM_FIELDS_FIELD_DISPLAY_DESC="Joomla offers some content events which are triggered during the content creation process. This is the place to define how the custom fields should be integrated into content."
 COM_FIELDS_FIELD_DISPLAY_LABEL="Automatic Display"
 COM_FIELDS_FIELD_DISPLAY_NO_DISPLAY="Do not automatically display"
+COM_FIELDS_FIELD_EDITABLE_IN_ADMIN="Administrator"
+COM_FIELDS_FIELD_EDITABLE_IN_BOTH="Both"
+COM_FIELDS_FIELD_EDITABLE_IN_DESC="On which part of the site should the field be editable?"
+COM_FIELDS_FIELD_EDITABLE_IN_LABEL="Editable In"
+COM_FIELDS_FIELD_EDITABLE_IN_SITE="Site"
 COM_FIELDS_FIELD_GROUP_DESC="The group this field belongs to."
 COM_FIELDS_FIELD_GROUP_LABEL="Field Group"
 COM_FIELDS_FIELD_LAYOUT_DESC="Choose an alternate layout."
@@ -50,11 +55,6 @@ COM_FIELDS_FIELD_RENDER_CLASS_DESC="The class attributes of the field when the f
 COM_FIELDS_FIELD_RENDER_CLASS_LABEL="Render Class"
 COM_FIELDS_FIELD_REQUIRED_DESC="Is this a mandatory field?"
 COM_FIELDS_FIELD_REQUIRED_LABEL="Required"
-COM_FIELDS_FIELD_SHOW_ON_ADMIN="Administrator"
-COM_FIELDS_FIELD_SHOW_ON_BOTH="Both"
-COM_FIELDS_FIELD_SHOW_ON_DESC="On which part of the site should the field be shown?"
-COM_FIELDS_FIELD_SHOW_ON_LABEL="Show On"
-COM_FIELDS_FIELD_SHOW_ON_SITE="Site"
 COM_FIELDS_FIELD_TYPE_DESC="The type of the field."
 COM_FIELDS_FIELD_TYPE_LABEL="Type"
 COM_FIELDS_FIELD_USE_GLOBAL="Use settings from Plugin"