Bug Fixes

joomla · Jun 10, 2017 · 0907a93 · 0907a93
1 parent 2eea412
commit 0907a93
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/administrator/components/com_installer/View/Updatesite/Html.php b/administrator/components/com_installer/View/Updatesite/Html.php
@@ -69,17 +69,19 @@ protected function addToolbar()
 	{
 		\JFactory::getApplication()->input->set('hidemainmenu', true);
 
-		$user       = \JFactory::getUser();
-		$userId     = $user->id;
-		$checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $userId);
+		//$user       = \JFactory::getUser();
+		//$userId     = $user->id;
+		//$checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $userId);
 
+		$checkedOut = false;
+
 		// Since we don't track these assets at the item level, use the category id.
-		$canDo = ContentHelper::getActions('com_installer', 'updatesite', $this->item->catid);
+		$canDo = ContentHelper::getActions('com_installer', 'updatesite');
 
 		\JToolbarHelper::title(\JText::_('COM_INSTALLER_UPDATESITE_EDIT_TITLE'), 'address contact');
 
 		// Since it's an existing record, check the edit permission, or fall back to edit own if the owner.
-		$itemEditable = $canDo->get('core.edit') || ($canDo->get('core.edit.own') && $this->item->created_by == $userId);
+		$itemEditable = $canDo->get('core.edit');
 
 		$toolbarButtons = [];
 

diff --git a/administrator/components/com_installer/tmpl/updatesite/edit.php b/administrator/components/com_installer/tmpl/updatesite/edit.php
@@ -11,7 +11,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 ?>
-<form action="<?php echo JRoute::_('index.php?option=com_installer&view=updatesite&layout=edit&id=' . (int) $this->item->id); ?>"
+<form action="<?php echo JRoute::_('index.php?option=com_installer&view=updatesite&layout=edit&update_site_id=' . (int) $this->item->update_site_id); ?>"
       method="post" name="adminForm" id="adminForm">
 	<div class="form-horizontal">
 		<fieldset class="adminform">