+
+ type), $fieldLayout
+ )
+ ) ? $fieldLayout[ucfirst($tjFieldsFieldTable->type)] : 'field';
+ $layout = new JLayoutFile($layoutToUse, JPATH_ROOT . '/components/com_tjfields/layouts/fields');
+ $output = $layout->render(array('fieldXml' => $fieldXml, 'field' => $field));
+ echo $output;
+ }
}
?>
label; ?>:
+
+ getFieldData($field->getAttribute('name'));
+
+ $ucmSubFormFieldParams = json_decode($fieldData->params);
+ $ucmSubFormFormSource = explode('/', $ucmSubFormFieldParams->formsource);
+ $ucmSubFormClient = $ucmSubFormFormSource[1] . '.' . str_replace('form_extra.xml', '', $ucmSubFormFormSource[4]);
+ $view = explode('.', $ucmSubFormClient);
+ $ucmSubFormData = (array) $ucmSubFormData;
+
+ if (!empty($ucmSubFormData))
+ {
+ $count = 0;
+
+ foreach ($ucmSubFormData as $subFormData)
+ {
+ $count++;
+ $contentIdFieldname = str_replace('.', '_', $ucmSubFormClient) . '_contentid';
+
+ $ucmSubformFormObject = $tjucmItemModel->getFormExtra(
+ array(
+ "clientComponent" => 'com_tjucm',
+ "client" => $ucmSubFormClient,
+ "view" => $view[1],
+ "layout" => 'default',
+ "content_id" => $subFormData->$contentIdFieldname)
+ );
+
+ $ucmSubFormFormXml = simplexml_load_file($field->formsource);
+
+ $ucmSubFormCount = 0;
+
+ foreach ($ucmSubFormFormXml as $ucmSubFormXmlFieldSet)
+ {
+ $ucmSubFormXmlFieldSets[$ucmSubFormCount] = $ucmSubFormXmlFieldSet;
+ $ucmSubFormCount++;
+ }
+
+ $ucmSubFormRecordData = $tjucmItemModel->getData($subFormData->$contentIdFieldname);
+
+ // Call the JLayout recursively to render fields of ucmsubform
+ $layout = new JLayoutFile('fields', JPATH_ROOT . '/components/com_tjucm/layouts/detail');
+ echo $layout->render(array('xmlFormObject' => $ucmSubFormXmlFieldSets, 'formObject' => $ucmSubformFormObject, 'itemData' => $ucmSubFormRecordData, 'isSubForm' => 1));
+
+ if (count($ucmSubFormData) > $count)
+ {
+ echo "
"; + } + } + } + ?> +
+ "; + } + } + } + ?> +
+
+
+ title); ?> +
+
authorise('core.type.edititem', 'com_tjucm.type.' . $this->ucmTypeId)) || ($user->authorise('core.type.editownitem', 'com_tjucm.type.' . $this->ucmTypeId) && JFactory::getUser()->id == $this->item->created_by))
+ if ((TjucmAccess::canEdit($this->ucmTypeId, $this->item->id)) || (TjucmAccess::canEditOwn($this->ucmTypeId, $this->item->id) && JFactory::getUser()->id == $this->item->created_by))
{
$redirectURL = JRoute::_('index.php?option=com_tjucm&task=item.edit&id=' . $this->item->id . '&client=' . $this->client, false);
?>
@@ -52,18 +64,22 @@
$deleteOwn = false;
- if ($user->authorise('core.type.deleteownitem', 'com_tjucm.type.' . $this->ucmTypeId))
+ if (TjucmAccess::canDeleteOwn($this->ucmTypeId, $this->item->id))
{
$deleteOwn = (JFactory::getUser()->id == $this->item->created_by ? true : false);
}
- if ($user->authorise('core.type.deleteitem', 'com_tjucm.type.' . $this->ucmTypeId) || $deleteOwn)
+ if (TjucmAccess::canDelete($this->ucmTypeId, $this->item->id) || $deleteOwn)
{
$redirectURL = JRoute::_('index.php?option=com_tjucm&task=itemform.remove&id=' . $this->item->id . '&client=' . $this->client . "&" . JSession::getFormToken() . '=1', false);
?>
client;
+ $itemId = $tjUcmFrontendHelper->getItemId($link);
?>
+
-
+
\ No newline at end of file
diff --git a/src/components/com_tjucm/site/views/item/view.html.php b/src/components/com_tjucm/site/views/item/view.html.php
index e387c7ca..4921e994 100644
--- a/src/components/com_tjucm/site/views/item/view.html.php
+++ b/src/components/com_tjucm/site/views/item/view.html.php
@@ -41,6 +41,16 @@ public function display($tpl = null)
{
$app = JFactory::getApplication();
+ if (!JFactory::getUser()->id)
+ {
+ $msg = JText::_('COM_TJUCM_LOGIN_MSG');
+
+ // Get current url.
+ $current = JUri::getInstance()->toString();
+ $url = base64_encode($current);
+ JFactory::getApplication()->redirect(JRoute::_('index.php?option=com_users&view=login&return=' . $url, false), $msg);
+ }
+
// Load tj-fields language file
$lang = JFactory::getLanguage();
$lang->load('com_tjfields', JPATH_SITE);
@@ -122,6 +132,7 @@ public function display($tpl = null)
$typeTable = JTable::getInstance('Type', 'TjucmTable', array('dbo', JFactory::getDbo()));
$typeTable->load(array('unique_identifier' => $this->client));
$typeParams = json_decode($typeTable->params);
+ $this->title = $typeTable->title;
if (isset($typeParams->details_layout) && !empty($typeParams->details_layout))
{
diff --git a/src/components/com_tjucm/site/views/itemform/tmpl/default.php b/src/components/com_tjucm/site/views/itemform/tmpl/default.php
index 9b02b752..744fe6db 100644
--- a/src/components/com_tjucm/site/views/itemform/tmpl/default.php
+++ b/src/components/com_tjucm/site/views/itemform/tmpl/default.php
@@ -125,7 +125,8 @@
title); ?>
-
+
+
+ ;?>media/com_tjucm/gif/loading.gif)
+
diff --git a/src/components/com_tjucm/site/views/itemform/view.html.php b/src/components/com_tjucm/site/views/itemform/view.html.php
index 6f8e5301..b7eb4b54 100644
--- a/src/components/com_tjucm/site/views/itemform/view.html.php
+++ b/src/components/com_tjucm/site/views/itemform/view.html.php
@@ -103,6 +103,17 @@ public function display($tpl = null)
$app = Factory::getApplication();
$input = $app->input;
$user = Factory::getUser();
+
+ if (!$user->id)
+ {
+ $msg = JText::_('COM_TJUCM_LOGIN_MSG');
+
+ // Get current url.
+ $current = JUri::getInstance()->toString();
+ $url = base64_encode($current);
+ JFactory::getApplication()->redirect(JRoute::_('index.php?option=com_users&view=login&return=' . $url, false), $msg);
+ }
+
$this->state = $this->get('State');
$this->id = $input->getInt('id', $input->getInt('content_id', 0));
@@ -128,28 +139,6 @@ public function display($tpl = null)
$clusterId = $this->item->cluster_id;
}
- // Get com_cluster component status
- if (ComponentHelper::getComponent('com_cluster', true)->enabled)
- {
- // Get com_subusers component status
- $subUserExist = ComponentHelper::getComponent('com_subusers', true)->enabled;
-
- // Check user have permission to edit record of assigned cluster
- if ($subUserExist && !empty($clusterId) && !$user->authorise('core.manageall', 'com_cluster'))
- {
- JLoader::import("/components/com_subusers/includes/rbacl", JPATH_ADMINISTRATOR);
-
- // Check user has permission for mentioned cluster
- if (!RBACL::authorise($user->id, 'com_cluster', 'core.manage', $clusterId))
- {
- $app->enqueueMessage(Text::_('JERROR_ALERTNOAUTHOR'), 'error');
- $app->setHeader('status', 403, true);
-
- return;
- }
- }
- }
-
// Get a copy record id
$this->copyRecId = (int) $app->getUserState('com_tjucm.edit.itemform.data.copy_id', 0);
@@ -232,6 +221,17 @@ public function display($tpl = null)
$typeTable->load(array('unique_identifier' => $this->client));
$typeParams = json_decode($typeTable->params);
+ if ($this->item->id)
+ {
+ if (!TjucmAccess::canEdit($typeTable->id, $this->item->id) && !TjucmAccess::canEditOwn($typeTable->id, $this->item->id))
+ {
+ $app->enqueueMessage(Text::_('JERROR_ALERTNOAUTHOR'), 'error');
+ $app->setHeader('status', 403, true);
+
+ return;
+ }
+ }
+
// Check if the UCM type is unpublished
if ($typeTable->state == "0")
{
diff --git a/src/components/com_tjucm/site/views/items/tmpl/default.php b/src/components/com_tjucm/site/views/items/tmpl/default.php
index be991251..e9b5df0a 100644
--- a/src/components/com_tjucm/site/views/items/tmpl/default.php
+++ b/src/components/com_tjucm/site/views/items/tmpl/default.php
@@ -54,11 +54,11 @@
jQuery(window).load(function()
{
var currentUcmType = new FormData();
- currentUcmType.append('client', '" . $this->client . "');
+ currentUcmType.append('client', '" . $this->client . "');
var afterCheckCompatibilityOfUcmType = function(error, response){
response = JSON.parse(response);
- if (response.data !== null)
+ if (response.data.length > 0)
{
jQuery('.copyToOther').removeClass('hide');
jQuery.each(response.data, function(key, value) {
@@ -71,15 +71,15 @@
// Code to check ucm type compatibility to copy item
com_tjucm.Services.Items.chekCompatibility(currentUcmType, afterCheckCompatibilityOfUcmType);
});
-
+
function copyItem()
{
var afterCopyItem = function(error, response){
response = JSON.parse(response);
-
+
// Close pop up and display message
jQuery( '#copyModal' ).modal('hide');
-
+
if(response.data !== null)
{
Joomla.renderMessages({'success':[response.message]});
@@ -89,12 +89,12 @@ function copyItem()
Joomla.renderMessages({'error':[response.message]});
}
}
-
+
var copyItemData = jQuery('#adminForm').serialize();
-
+
// Code to copy item to ucm type
com_tjucm.Services.Items.copyItem(copyItemData, afterCopyItem);
- }
+ }
");
$statusColumnWidth = 0;
@@ -108,7 +108,7 @@ function copyItem()
?>
- title) . " " . JText::_("COM_TJUCM_FORM_LIST"); ?>
+ title) . " " . JText::_("COM_TJUCM_FORM_LIST"); ?>
-
+
+
-
+
canEdit || $this->canDelete)
- {
?>
-
items))
- {
- echo $this->pagination->getListFooter();
- }
+ if (!empty($this->items))
+ {
+ echo $this->pagination->getPagesLinks();
+ }
?>
@@ -286,16 +281,23 @@ class="btn btn-success btn-small">
-
-
-
-
canImport)
+ {
+ ?>
+
+
+
+
+
+
+
+
-
@@ -309,16 +311,16 @@ class="btn btn-success btn-small">
- Select Ucm Type
+
- state->get('filter.ucm_list'), 'ucm_list' ); ?>
-
+ state->get('filter.ucm_list'), 'ucm_list'); ?>
+
@@ -327,22 +329,16 @@ class="btn btn-success btn-small">
-canDelete)
-{
- ?>
-
-
diff --git a/src/components/com_tjucm/site/views/items/tmpl/default_filters.php b/src/components/com_tjucm/site/views/items/tmpl/default_filters.php
index c2391ce9..60c067d3 100644
--- a/src/components/com_tjucm/site/views/items/tmpl/default_filters.php
+++ b/src/components/com_tjucm/site/views/items/tmpl/default_filters.php
@@ -24,6 +24,9 @@
value="escape($this->state->get($this->client . '.filter.search')); ?>"
placeholder=""/>
+
-
enabled)
{
JLoader::import('components.com_tjfields.tables.field', JPATH_ADMINISTRATOR);
@@ -55,14 +53,54 @@
if ($fieldTable->id)
{
- JFormHelper::addFieldPath(JPATH_ADMINISTRATOR . '/components/com_tjfields/models/fields/');
- $cluster = JFormHelper::loadFieldType('cluster', false);
- $this->clusterList = $cluster->getOptionsExternally();
+ JLoader::import("/components/com_subusers/includes/rbacl", JPATH_ADMINISTRATOR);
+ JLoader::import("/components/com_cluster/includes/cluster", JPATH_ADMINISTRATOR);
+ $clustersModel = ClusterFactory::model('Clusters', array('ignore_request' => true));
+ $clusters = $clustersModel->getItems();
+
+ // Get list of clusters with data in UCM type
+ $db = JFactory::getDbo();
+ $query = $db->getQuery(true);
+ $query->select($db->quoteName('cluster_id'));
+ $query->from($db->quoteName('#__tj_ucm_data'));
+ $query->where($db->quoteName('client') . '=' . $db->quote($this->client));
+ $query->group($db->quoteName('cluster_id'));
+ $db->setQuery($query);
+ $clustersWithData = $db->loadColumn();
+
+ $usersClusters = array();
+
+ $clusterObj = new stdclass;
+ $clusterObj->text = JText::_("COM_TJFIELDS_OWNERSHIP_CLUSTER");
+ $clusterObj->value = "";
+
+ $usersClusters[] = $clusterObj;
+
+ if (!empty($clusters))
+ {
+ foreach ($clusters as $clusterList)
+ {
+ if (RBACL::check(JFactory::getUser()->id, 'com_cluster', 'core.viewitem.' . $this->ucmTypeId, $clusterList->id) || RBACL::check(JFactory::getUser()->id, 'com_cluster', 'core.viewallitem.' . $this->ucmTypeId))
+ {
+ if (!empty($clusterList->id))
+ {
+ if (in_array($clusterList->id, $clustersWithData))
+ {
+ $clusterObj = new stdclass;
+ $clusterObj->text = $clusterList->name;
+ $clusterObj->value = $clusterList->id;
+
+ $usersClusters[] = $clusterObj;
+ }
+ }
+ }
+ }
+ }
?>
+
+
diff --git a/src/components/com_tjucm/site/views/itemform/view.html.php b/src/components/com_tjucm/site/views/itemform/view.html.php
index 6f8e5301..b7eb4b54 100644
--- a/src/components/com_tjucm/site/views/itemform/view.html.php
+++ b/src/components/com_tjucm/site/views/itemform/view.html.php
@@ -103,6 +103,17 @@ public function display($tpl = null)
$app = Factory::getApplication();
$input = $app->input;
$user = Factory::getUser();
+
+ if (!$user->id)
+ {
+ $msg = JText::_('COM_TJUCM_LOGIN_MSG');
+
+ // Get current url.
+ $current = JUri::getInstance()->toString();
+ $url = base64_encode($current);
+ JFactory::getApplication()->redirect(JRoute::_('index.php?option=com_users&view=login&return=' . $url, false), $msg);
+ }
+
$this->state = $this->get('State');
$this->id = $input->getInt('id', $input->getInt('content_id', 0));
@@ -128,28 +139,6 @@ public function display($tpl = null)
$clusterId = $this->item->cluster_id;
}
- // Get com_cluster component status
- if (ComponentHelper::getComponent('com_cluster', true)->enabled)
- {
- // Get com_subusers component status
- $subUserExist = ComponentHelper::getComponent('com_subusers', true)->enabled;
-
- // Check user have permission to edit record of assigned cluster
- if ($subUserExist && !empty($clusterId) && !$user->authorise('core.manageall', 'com_cluster'))
- {
- JLoader::import("/components/com_subusers/includes/rbacl", JPATH_ADMINISTRATOR);
-
- // Check user has permission for mentioned cluster
- if (!RBACL::authorise($user->id, 'com_cluster', 'core.manage', $clusterId))
- {
- $app->enqueueMessage(Text::_('JERROR_ALERTNOAUTHOR'), 'error');
- $app->setHeader('status', 403, true);
-
- return;
- }
- }
- }
-
// Get a copy record id
$this->copyRecId = (int) $app->getUserState('com_tjucm.edit.itemform.data.copy_id', 0);
@@ -232,6 +221,17 @@ public function display($tpl = null)
$typeTable->load(array('unique_identifier' => $this->client));
$typeParams = json_decode($typeTable->params);
+ if ($this->item->id)
+ {
+ if (!TjucmAccess::canEdit($typeTable->id, $this->item->id) && !TjucmAccess::canEditOwn($typeTable->id, $this->item->id))
+ {
+ $app->enqueueMessage(Text::_('JERROR_ALERTNOAUTHOR'), 'error');
+ $app->setHeader('status', 403, true);
+
+ return;
+ }
+ }
+
// Check if the UCM type is unpublished
if ($typeTable->state == "0")
{
diff --git a/src/components/com_tjucm/site/views/items/tmpl/default.php b/src/components/com_tjucm/site/views/items/tmpl/default.php
index be991251..e9b5df0a 100644
--- a/src/components/com_tjucm/site/views/items/tmpl/default.php
+++ b/src/components/com_tjucm/site/views/items/tmpl/default.php
@@ -54,11 +54,11 @@
jQuery(window).load(function()
{
var currentUcmType = new FormData();
- currentUcmType.append('client', '" . $this->client . "');
+ currentUcmType.append('client', '" . $this->client . "');
var afterCheckCompatibilityOfUcmType = function(error, response){
response = JSON.parse(response);
- if (response.data !== null)
+ if (response.data.length > 0)
{
jQuery('.copyToOther').removeClass('hide');
jQuery.each(response.data, function(key, value) {
@@ -71,15 +71,15 @@
// Code to check ucm type compatibility to copy item
com_tjucm.Services.Items.chekCompatibility(currentUcmType, afterCheckCompatibilityOfUcmType);
});
-
+
function copyItem()
{
var afterCopyItem = function(error, response){
response = JSON.parse(response);
-
+
// Close pop up and display message
jQuery( '#copyModal' ).modal('hide');
-
+
if(response.data !== null)
{
Joomla.renderMessages({'success':[response.message]});
@@ -89,12 +89,12 @@ function copyItem()
Joomla.renderMessages({'error':[response.message]});
}
}
-
+
var copyItemData = jQuery('#adminForm').serialize();
-
+
// Code to copy item to ucm type
com_tjucm.Services.Items.copyItem(copyItemData, afterCopyItem);
- }
+ }
");
$statusColumnWidth = 0;
@@ -108,7 +108,7 @@ function copyItem()
?>
+ - title) . " " . JText::_("COM_TJUCM_FORM_LIST"); ?> + title) . " " . JText::_("COM_TJUCM_FORM_LIST"); ?>
+
+
+
+
+
+
-
@@ -309,16 +311,16 @@ class="btn btn-success btn-small">
- Select Ucm Type
+
- state->get('filter.ucm_list'), 'ucm_list' ); ?>
-
+ state->get('filter.ucm_list'), 'ucm_list'); ?>
+
@@ -327,22 +329,16 @@ class="btn btn-success btn-small">
-canDelete)
-{
- ?>
-
-
diff --git a/src/components/com_tjucm/site/views/items/tmpl/default_filters.php b/src/components/com_tjucm/site/views/items/tmpl/default_filters.php
index c2391ce9..60c067d3 100644
--- a/src/components/com_tjucm/site/views/items/tmpl/default_filters.php
+++ b/src/components/com_tjucm/site/views/items/tmpl/default_filters.php
@@ -24,6 +24,9 @@
value="escape($this->state->get($this->client . '.filter.search')); ?>"
placeholder=""/>
+