Mereged release1.1.1 into master

administrator/access.xml

@@ -8,13 +8,8 @@
 		<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.chart.view" title="COM_HIERARCHY_CHART_TITLE" description="COM_HIERARCHY_CHART_VIEW_DESC" />
+		<action name="core.csv.import" title="COM_HIERARCHY_IMPCSV_TITLE" description="COM_HIERARCHY_IMPCSV_DESC" />
+		<action name="core.csv.export" title="COM_HIERARCHY_EXPCSV_TITLE" description="COM_HIERARCHY_EXPCSV_DESC" />
 	</section>
-    <section name="hierarchy">
-		<action name="core.create" title="JACTION_CREATE" description="JACTION_CREATE_COMPONENT_DESC" />
-		<action name="core.delete" title="JACTION_DELETE" description="JACTION_DELETE_COMPONENT_DESC" />
-		<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" />
-	</section>
-
 </access>

administrator/assets/elements/integrations.php

@@ -0,0 +1,100 @@
+<?php
+/**
+ * @version    SVN: <svn_id>
+ * @package    Com_Hierarchy
+ * @author     Techjoomla <[email protected]>
+ * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
+ * @license    GNU General Public License version 2 or later.
+ */
+
+defined('_JEXEC') or die('Restricted access');
+jimport('joomla.form.formfield');
+
+/**
+ * JFormFieldIntegrations class
+ *
+ * @package     Com_Hierarchy
+ * @subpackage  component
+ * @since       1.0
+ */
+class JFormFieldIntegrations extends JFormField
+{
+	/**
+	 *Function to construct a hierarchy view
+	 *
+	 * @since  3.0
+	 */
+	public function __construct()
+	{
+		$this->communityMainFile = JPATH_SITE . '/components/com_community/community.php';
+		$this->jeventsMainFile   = JPATH_SITE . '/components/com_jevents/jevents.php';
+		$this->esMainFile        = JPATH_SITE . '/components/com_easysocial/easysocial.php';
+		$this->easyProMainFile   = JPATH_SITE . '/components/com_jsn/jsn.php';
+		$this->cbMainFile        = JPATH_SITE . '/components/com_comprofiler/comprofiler.php';
+
+		parent::__construct();
+	}
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @since  1.6
+	 *
+	 * @return   string  The field input markup
+	 */
+	public function getInput ()
+	{
+		return $this->fetchElement($this->name, $this->value, $this->element, $this->options['controls']);
+	}
+
+	/**
+	 * Method fetchElement
+	 *
+	 * @param   string  $name         name of element
+	 * @param   string  $value        value of element
+	 * @param   string  $controlName  control name
+	 *
+	 * @return  array extensions list
+	 *
+	 * @since   1.0
+	 */
+	public function fetchElement ($name, $value, $controlName)
+	{
+		if ($name == 'jform[integration]')
+		{
+			$options = array();
+			$options[] = JHtml::_('select.option', '2', JText::_('COM_HIERARCHY_NATIVE'));
+
+			if (JFile::exists($this->communityMainFile))
+			{
+				$options[] = JHtml::_('select.option', '1', JText::_('COM_HIERARCHY_JOMSOCIAL'));
+			}
+
+			if (JFile::exists($this->jeventsMainFile))
+			{
+				$options[] = JHtml::_('select.option', '3', JText::_('COM_HIERARCHY_JEVENT'));
+			}
+
+			if (JFile::exists($this->esMainFile))
+			{
+				$options[] = JHtml::_('select.option', '4', JText::_('COM_HIERARCHY_EASYSOCIAL'));
+			}
+
+			if (JFile::exists($this->easyProMainFile))
+			{
+				$options[] = JHtml::_('select.option', '5', JText::_('COM_HIERARCHY_EASYPROFILE'));
+			}
+
+			if (JFile::exists($this->cbMainFile))
+			{
+				$options[] = JHtml::_('select.option', '6', JText::_('COM_HIERARCHY_COMMUNITY_BUILDER'));
+			}
+
+			$fieldName = $name;
+		}
+
+		$html = JHtml::_('select.genericlist',  $options, $fieldName, 'class="inputbox"', 'value', 'text', $value, $controlName . $name);
+
+		return $html;
+	}
+}

administrator/config.xml

@@ -1,22 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
-    <fieldset label="COM_HIERARCHY" name="hierarchy" addfieldpath="/administrator/components/com_hierarchy/assets/elements">
-		<field name="groups_for_self_nomination" type="accesslevelsenroll" multiple="multiple" default="" label="COM_HIEARCHY_SELECT_ACCESS_LEVELS_FOR_ENROLLMENT" description="COM_HIEARCHY_SELECT_ACCESS_LEVELS_FOR_ENROLLMENT_DESC" />
-		<field name="groups_for_any_nomination" type="accesslevelsenroll" multiple="multiple" default="" label="COM_HIEARCHY_SELECT_ACCESS_LEVELS_FOR_ANY_ENROLLMENT" description="COM_HIEARCHY_SELECT_ACCESS_LEVELS_FOR_ANY_ENROLLMENT_DESC" />
-		<field name="nomination_end_date" type="calendar"  default="" label="COM_HIEARCHY_NOMINATOIN_END_DATE" description="COM_HIEARCHY_NOMINATOIN_END_DATE" />
-
-    </fieldset>
-    <fieldset label="COM_HIERARCHY_RESCHDULE" name="reschedule">
-		<field name="hrhead" type="text" label="COM_HIEARCHY_HR_HEAD" description="COM_HIEARCHY_HR_HEA_DESC" />
-		<field name="reschedule_perfix" type="text" label="COM_HIEARCHY_RESCHEDUL_PERFIX" description="COM_HIEARCHY_RESCHEDUL_PERFIX_DESC" />
-		<field name="groupid" type="text" label="COM_HIEARCHY_GROUP_ID" default="10" description="COM_HIEARCHY_GROUP_ID_DESC" />
-		<field name="reschedule_manager_email" type="text" label="COM_HIEARCHY_RESCHEDULE_MANAGER_EMAIL" default="" description="COM_HIEARCHY_RESCHEDULE_MANAGER_EMAIL" />
-		<field name="reschedule_approva_cc_email" type="text" label="COM_HIEARCHY_RESCHEDULE_APPROVE_CC_EMAILS" default="" description="COM_HIEARCHY_RESCHEDULE_APPROVE_CC_EMAILS_DESC" />
-		<field name="reschedule_email_from" type="text" label="COM_HIEARCHY_RESCHEDULE_EMAIL_FORM" default="" description="COM_HIEARCHY_RESCHEDULE_EMAIL_FORM" />
-		<field name="reschedule_email_Reply_To" type="text" label="COM_HIEARCHY_RESCHEDULE_EMAIL_REPLAY_TO" default="" description="COM_HIEARCHY_RESCHEDULE_EMAIL_REPLAY_TO" />
-
-    </fieldset>
-    <fieldset name="permissions" description="JCONFIG_PERMISSIONS_DESC" label="JCONFIG_PERMISSIONS_LABEL">
+	<fieldset label="COM_HIERARCHY_GENERAL" name="hierarchy" addfieldpath="/administrator/components/com_hierarchy/assets/elements">
+		<field name="integration" class="radio btn-group" type="integrations" default="2" description="COM_HIERARCHY_INTEGRATIONS_DESC" label="COM_HIERARCHY_INTEGRATIONS" />
+		<field name="gravatar" class="btn-group" type="radio" default="0" label="COM_HIERARCHY_GRAVATAR_INT_CONF" description="COM_HIERARCHY_GRAVATAR_INT_CONF_DESC" >
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+	</fieldset>
+	<fieldset name="permissions" description="JCONFIG_PERMISSIONS_DESC" label="JCONFIG_PERMISSIONS_LABEL">
 		<field name="rules" type="rules" component="com_hierarchy" class="inputbox" filter="rules" validate="rules" label="JCONFIG_PERMISSIONS_LABEL" section="component" />
 	</fieldset>
 </config>

administrator/controller.php

@@ -1,14 +1,15 @@
 <?php
 /**
- * @package     Joomla.Administrator
- * @subpackage  com_hierarchy
- *
- * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ * @version    SVN: <svn_id>
+ * @package    Com_Hierarchy
+ * @author     Techjoomla <[email protected]>
+ * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
+ * @license    GNU General Public License version 2 or later.
  */
 
 // No direct access
 defined('_JEXEC') or die;
+
 /**
  * Hierarchy view class for the hierarchy package.
  *