From f7691ed50d75b2a40c86e1e295acdb455ceaf73c Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Sat, 25 Feb 2017 11:42:25 +0100
Subject: [PATCH 1/4] first step for custom_fields

---
 .../components/com_weblinks/access.xml            | 15 +++++++++++++++
 .../components/com_weblinks/config.xml            | 11 +++++++++++
 .../components/com_weblinks/helpers/weblinks.php  | 15 +++++++++++++++
 3 files changed, 41 insertions(+)

diff --git a/src/administrator/components/com_weblinks/access.xml b/src/administrator/components/com_weblinks/access.xml
index 4cda7d9..1622da5 100644
--- a/src/administrator/components/com_weblinks/access.xml
+++ b/src/administrator/components/com_weblinks/access.xml
@@ -9,6 +9,7 @@
 		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC" />
 		<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE_COMPONENT_DESC" />
 		<action name="core.edit.own" title="JACTION_EDITOWN" description="JACTION_EDITOWN_COMPONENT_DESC" />
+		<action name="core.edit.value" title="JACTION_EDITVALUE" description="JACTION_EDITVALUE_COMPONENT_DESC" />
 	</section>
 	<section name="category">
 		<action name="core.create" title="JACTION_CREATE" description="COM_CATEGORIES_ACCESS_CREATE_DESC" />
@@ -17,4 +18,18 @@
 		<action name="core.edit.state" title="JACTION_EDITSTATE" description="COM_CATEGORIES_ACCESS_EDITSTATE_DESC" />
 		<action name="core.edit.own" title="JACTION_EDITOWN" description="COM_CATEGORIES_ACCESS_EDITOWN_DESC" />
 	</section>
+	<section name="fieldgroup">
+		<action name="core.create" title="JACTION_CREATE" description="COM_FIELDS_GROUP_PERMISSION_CREATE_DESC" />
+		<action name="core.delete" title="JACTION_DELETE" description="COM_FIELDS_GROUP_PERMISSION_DELETE_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="COM_FIELDS_GROUP_PERMISSION_EDIT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="COM_FIELDS_GROUP_PERMISSION_EDITSTATE_DESC" />
+		<action name="core.edit.own" title="JACTION_EDITOWN" description="COM_FIELDS_GROUP_PERMISSION_EDITOWN_DESC" />
+		<action name="core.edit.value" title="JACTION_EDITVALUE" description="COM_FIELDS_GROUP_PERMISSION_EDITVALUE_DESC" />
+	</section>
+	<section name="field">
+		<action name="core.delete" title="JACTION_DELETE" description="COM_FIELDS_FIELD_PERMISSION_DELETE_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="COM_FIELDS_FIELD_PERMISSION_EDIT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="COM_FIELDS_FIELD_PERMISSION_EDITSTATE_DESC" />
+		<action name="core.edit.value" title="JACTION_EDITVALUE" description="COM_FIELDS_FIELD_PERMISSION_EDITVALUE_DESC" />
+	</section>
 </access>
diff --git a/src/administrator/components/com_weblinks/config.xml b/src/administrator/components/com_weblinks/config.xml
index 04e0079..924871d 100644
--- a/src/administrator/components/com_weblinks/config.xml
+++ b/src/administrator/components/com_weblinks/config.xml
@@ -363,6 +363,17 @@
 				<option value="0">JHIDE</option>
 		</field>
 
+		<field
+			name="custom_fields_enable"
+			type="radio"
+			label="JGLOBAL_CUSTOM_FIELDS_ENABLE_LABEL"
+			description="JGLOBAL_CUSTOM_FIELDS_ENABLE_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
 	</fieldset>
 
 	<fieldset name="permissions"
diff --git a/src/administrator/components/com_weblinks/helpers/weblinks.php b/src/administrator/components/com_weblinks/helpers/weblinks.php
index 01ff922..ed65fac 100644
--- a/src/administrator/components/com_weblinks/helpers/weblinks.php
+++ b/src/administrator/components/com_weblinks/helpers/weblinks.php
@@ -38,6 +38,21 @@ class WeblinksHelper extends JHelperContent
 			'index.php?option=com_categories&extension=com_weblinks',
 			$vName == 'categories'
 		);
+
+		if (JComponentHelper::isEnabled('com_fields') && JComponentHelper::getParams('com_weblinks')->get('custom_fields_enable', '1'))
+		{
+			JHtmlSidebar::addEntry(
+				JText::_('JGLOBAL_FIELDS'),
+				'index.php?option=com_fields&context=com_weblinks.weblink',
+				$vName == 'fields.fields'
+			);
+
+			JHtmlSidebar::addEntry(
+				JText::_('JGLOBAL_FIELD_GROUPS'),
+				'index.php?option=com_fields&view=groups&context=com_weblinks.weblink',
+				$vName == 'fields.groups'
+			);
+		}
 	}
 
 	/**

From 95bd6c9c2e6b5e54ab12ea70b43807917e0e3210 Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Sat, 25 Feb 2017 11:52:36 +0100
Subject: [PATCH 2/4] cs

---
 src/administrator/components/com_weblinks/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/administrator/components/com_weblinks/config.xml b/src/administrator/components/com_weblinks/config.xml
index 924871d..f11ad49 100644
--- a/src/administrator/components/com_weblinks/config.xml
+++ b/src/administrator/components/com_weblinks/config.xml
@@ -370,7 +370,7 @@
 			description="JGLOBAL_CUSTOM_FIELDS_ENABLE_DESC"
 			default="1"
 			class="btn-group btn-group-yesno"
-			>
+		>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>

From d4a03c2d558b7883f09bc8c45155be0a97b7fa9e Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Sat, 25 Feb 2017 13:04:33 +0100
Subject: [PATCH 3/4] default should be off

---
 src/administrator/components/com_weblinks/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/administrator/components/com_weblinks/config.xml b/src/administrator/components/com_weblinks/config.xml
index f11ad49..f3947cc 100644
--- a/src/administrator/components/com_weblinks/config.xml
+++ b/src/administrator/components/com_weblinks/config.xml
@@ -368,7 +368,7 @@
 			type="radio"
 			label="JGLOBAL_CUSTOM_FIELDS_ENABLE_LABEL"
 			description="JGLOBAL_CUSTOM_FIELDS_ENABLE_DESC"
-			default="1"
+			default="0"
 			class="btn-group btn-group-yesno"
 		>
 			<option value="1">JYES</option>

From e69347e2558f3887ad177ee8a60af304592e6757 Mon Sep 17 00:00:00 2001
From: Astrid <astridx@users.noreply.github.com>
Date: Sat, 16 Sep 2017 18:36:25 +0200
Subject: [PATCH 4/4] Update config.xml

deleted merge conflict hints.
---
 src/administrator/components/com_weblinks/config.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/administrator/components/com_weblinks/config.xml b/src/administrator/components/com_weblinks/config.xml
index e1172ca..6452858 100644
--- a/src/administrator/components/com_weblinks/config.xml
+++ b/src/administrator/components/com_weblinks/config.xml
@@ -411,7 +411,6 @@
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
-<<<<<<< HEAD
 
 		<field
 			name="custom_fields_enable"
@@ -424,8 +423,6 @@
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
-=======
->>>>>>> e8a9d563afa331e4975832959b0f19826a66b793
 	</fieldset>
 
 	<fieldset