Another fix for submission ACL check, don't check if not record_in_da…

…tabase ('cos doesn't have a list / list ACLs)
Fabrik · Nov 3, 2016 · 0b4b877 · 0b4b877
1 parent 76c0176
commit 0b4b877
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 15 deletions.
diff --git a/components/com_fabrik/controllers/form.php b/components/com_fabrik/controllers/form.php
@@ -215,23 +215,30 @@ public function process()
 		 *
 		 * Used to setFormData() in the model validate(), but need to get it here so we can pass it to canEdit()
 		 */
-		$formData         = $model->setFormData();
-		$aclOK            = false;
-
-		if ($model->isNewRecord() && $listModel->canAdd())
-		{
-			$aclOK = true;
-		}
-		else if (!$model->isNewRecord() && $listModel->canEdit($formData))
+		if ($model->recordInDatabase())
 		{
-			$aclOK = true;
-		}
+			$formData = $model->setFormData();
+			$aclOK    = false;
 
-		if (!$aclOK)
-		{
-			$msg = $model->aclMessage(true);
-			$app->enqueueMessage($msg);
-			return;
+			if ($model->isNewRecord() && $listModel->canAdd())
+			{
+				$aclOK = true;
+			}
+			else
+			{
+				if (!$model->isNewRecord() && $listModel->canEdit($formData))
+				{
+					$aclOK = true;
+				}
+			}
+
+			if (!$aclOK)
+			{
+				$msg = $model->aclMessage(true);
+				$app->enqueueMessage($msg);
+
+				return;
+			}
 		}
 
 		/**

diff --git a/components/com_fabrik/models/form.php b/components/com_fabrik/models/form.php
@@ -5366,4 +5366,11 @@ public function getLayout($name, $paths = array(), $options = array())
 
 		return $layout;
 	}
+
+	public function recordInDatabase()
+	{
+		$form = $this->getForm();
+
+		return $form->record_in_database === '1';
+	}
 }