User with edit_own permission should be able to load Versions

joomla · Jun 16, 2016 · 4b41620 · 4b41620
1 parent 3c1c8df
commit 4b41620
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 25 deletions.
diff --git a/administrator/components/com_banners/views/banner/view.html.php b/administrator/components/com_banners/views/banner/view.html.php
@@ -112,7 +112,7 @@ protected function addToolbar()
 		}
 		else
 		{
-			if ($this->state->params->get('save_history', 0) && $user->authorise('core.edit'))
+			if ($this->state->params->get('save_history', 0) && ($user->authorise('core.edit') || $user->authorise('core.edit.own')))
 			{
 				JToolbarHelper::versions('com_banners.banner', $this->item->id);
 			}

diff --git a/administrator/components/com_banners/views/client/view.html.php b/administrator/components/com_banners/views/client/view.html.php
@@ -117,7 +117,7 @@ protected function addToolbar()
 		}
 		else
 		{
-			if ($this->state->params->get('save_history', 0) && $user->authorise('core.edit'))
+			if ($this->state->params->get('save_history', 0) && ($user->authorise('core.edit') || $user->authorise('core.edit.own')))
 			{
 				JToolbarHelper::versions('com_banners.client', $this->item->id);
 			}

diff --git a/administrator/components/com_contact/views/contact/view.html.php b/administrator/components/com_contact/views/contact/view.html.php
@@ -129,7 +129,7 @@ protected function addToolbar()
 				JToolbarHelper::save2copy('contact.save2copy');
 			}
 
-			if ($this->state->params->get('save_history', 0) && $user->authorise('core.edit'))
+			if ($this->state->params->get('save_history', 0) && ($user->authorise('core.edit') || $user->authorise('core.edit.own')))
 			{
 				JToolbarHelper::versions('com_contact.contact', $this->item->id);
 			}

diff --git a/administrator/components/com_content/views/article/view.html.php b/administrator/components/com_content/views/article/view.html.php
@@ -124,7 +124,7 @@ protected function addToolbar()
 				JToolbarHelper::save2copy('article.save2copy');
 			}
 
-			if ($this->state->params->get('save_history', 0) && $canDo->get('core.edit'))
+			if ($this->state->params->get('save_history', 0) && ($canDo->get('core.edit') || $canDo->get('core.edit.own')))
 			{
 				JToolbarHelper::versions('com_content.article', $this->item->id);
 			}

diff --git a/administrator/components/com_contenthistory/models/compare.php b/administrator/components/com_contenthistory/models/compare.php
@@ -52,25 +52,37 @@ public function getItems()
 				return false;
 			}
 
+			$user = JFactory::getUser();
 			// Access check
-			if (!JFactory::getUser()->authorise('core.edit', $contentTypeTable->type_alias . '.' . (int) $table1->ucm_item_id))
+			if ($user->authorise('core.edit', $contentTypeTable->type_alias . '.' . (int) $table1->ucm_item_id))
+			{
+				$return = true;
+			}
+			elseif ($user->authorise('core.edit.own', $contentTypeTable->type_alias . '.' . (int) $table1->ucm_item_id))
+			{
+				$return = true;
+			}
+			else
 			{
 				$this->setError(JText::_('JERROR_ALERTNOAUTHOR'));
 
 				return false;
 			}
 
 			// All's well, process the records
-			foreach (array($table1, $table2) as $table)
+			if ($return = true)
 			{
-				$object = new stdClass;
-				$object->data = ContenthistoryHelper::prepareData($table);
-				$object->version_note = $table->version_note;
-				$object->save_date = $table->save_date;
-				$result[] = $object;
-			}
+				foreach (array($table1, $table2) as $table)
+				{
+					$object = new stdClass;
+					$object->data = ContenthistoryHelper::prepareData($table);
+					$object->version_note = $table->version_note;
+					$object->save_date = $table->save_date;
+					$result[] = $object;
+				}
 
-			return $result;
+				return $result;
+			}
 		}
 
 		return false;

diff --git a/administrator/components/com_contenthistory/models/history.php b/administrator/components/com_contenthistory/models/history.php
@@ -147,6 +147,7 @@ public function delete(&$pks)
 	public function getItems()
 	{
 		$items = parent::getItems();
+		$user = JFactory::getUser();
 
 		if ($items === false)
 		{
@@ -171,15 +172,20 @@ public function getItems()
 		}
 
 		// Access check
-		if (!JFactory::getUser()->authorise('core.edit', $contentTypeTable->type_alias . '.' . (int) $items[0]->ucm_item_id))
+		if ($user->authorise('core.edit', $contentTypeTable->type_alias . '.' . (int) $items[0]->ucm_item_id))
+		{
+			return $items;
+		}
+		elseif ($user->authorise('core.edit.own', $contentTypeTable->type_alias . '.' . (int) $items[0]->ucm_item_id))
+		{
+			return $items;
+		}
+		else
 		{
 			$this->setError(JText::_('JERROR_ALERTNOAUTHOR'));
 
 			return false;
 		}
-
-		// All good, return the items array
-		return $items;
 	}
 
 	/**

diff --git a/administrator/components/com_contenthistory/models/preview.php b/administrator/components/com_contenthistory/models/preview.php
@@ -46,20 +46,32 @@ public function getItem()
 			return false;
 		}
 
+		$user = JFactory::getUser();
 		// Access check
-		if (!JFactory::getUser()->authorise('core.edit', $contentTypeTable->type_alias . '.' . (int) $table->ucm_item_id))
+		if ($user->authorise('core.edit', $contentTypeTable->type_alias . '.' . (int) $table->ucm_item_id))
+		{
+			$return = true;
+		}
+		elseif ($user->authorise('core.edit.own', $contentTypeTable->type_alias . '.' . (int) $table->ucm_item_id))
+		{
+			$return = true;
+		}
+		else
 		{
 			$this->setError(JText::_('JERROR_ALERTNOAUTHOR'));
 
 			return false;
 		}
 
 		// Good to go, finish processing the data
-		$result = new stdClass;
-		$result->save_date = $table->save_date;
-		$result->version_note = $table->version_note;
-		$result->data = ContenthistoryHelper::prepareData($table);
+		if ($return = true)
+		{
+			$result = new stdClass;
+			$result->save_date = $table->save_date;
+			$result->version_note = $table->version_note;
+			$result->data = ContenthistoryHelper::prepareData($table);
 
-		return $result;
+			return $result;
+		}
 	}
 }
diff --git a/administrator/components/com_newsfeeds/views/newsfeed/view.html.php b/administrator/components/com_newsfeeds/views/newsfeed/view.html.php
@@ -115,7 +115,7 @@ protected function addToolbar()
 		}
 		else
 		{
-			if ($this->state->params->get('save_history', 0) && $user->authorise('core.edit'))
+			if ($this->state->params->get('save_history', 0) && ($user->authorise('core.edit') || $user->authorise('core.edit.own')))
 			{
 				JToolbarHelper::versions('com_newsfeeds.newsfeed', $this->item->id);
 			}

diff --git a/administrator/components/com_tags/views/tag/view.html.php b/administrator/components/com_tags/views/tag/view.html.php
@@ -116,7 +116,7 @@ protected function addToolbar()
 		}
 		else
 		{
-			if ($this->state->params->get('save_history', 0) && $user->authorise('core.edit'))
+			if ($this->state->params->get('save_history', 0) && ($user->authorise('core.edit') || $user->authorise('core.edit.own')))
 			{
 				JToolbarHelper::versions('com_tags.tag', $this->item->id);
 			}