Merge Release 1.0.4 into Master (#91)

* Bug #167400 fix: Redirection on form submit issue for front and backend (#88) * Bug #167400 fix: Reirection issue for front and backend * Bug #167400 fix: Update version in xml * Bug #167400 fix: Redirection on form submit issue for front and backend (#89) * Bug #167400 fix: Redirection on form submit issue for front and backend * Bug #167400 fix: Redirection on form submit issue for front and backend * Bug #167400 fix: Redirection on form submit issue for front and backend (#90) Co-authored-by: Tushar Shekokar <[email protected]> Co-authored-by: pranotiTechjoomla <[email protected]>
techjoomla · Jan 19, 2021 · 8c513b1 · 8c513b1
1 parent 9b4c33c
commit 8c513b1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/src/components/com_tjcertificate/administrator/controllers/trainingrecord.php b/src/components/com_tjcertificate/administrator/controllers/trainingrecord.php
@@ -48,7 +48,8 @@ public function save($key = null, $urlVar = null)
 		$app      = Factory::getApplication();
 		$user     = Factory::getUser();
 		$recordId = $app->input->getInt('id');
-		$params = ComponentHelper::getParams('com_tjcertificate');
+		$params   = ComponentHelper::getParams('com_tjcertificate');
+		$task     = $this->getTask();
 
 		if (!$user->id)
 		{
@@ -151,10 +152,22 @@ public function save($key = null, $urlVar = null)
 		// Save task using to "Save & Close" action which is used only in backend
 		if ($task === "save")
 		{
-			// Redirect to the list screen.
-			$this->setRedirect(
-				Route::_('index.php?option=com_tjcertificate&view=certificates', false)
-			);
+			$site = $app->input->get('site', 'f', 'string');
+
+			if ($site == 'f')
+			{
+				// Redirect to the list screen.
+				$this->setRedirect(
+					Route::_('index.php?option=com_tjcertificate&view=certificates&layout=my', false)
+				);
+			}
+			else
+			{
+				// Redirect to the list screen.
+				$this->setRedirect(
+					Route::_('index.php?option=com_tjcertificate&view=certificates', false)
+				);
+			}
 		}
 
 		// Flush the data from the session.

diff --git a/src/components/com_tjcertificate/site/views/trainingrecord/tmpl/edit.php b/src/components/com_tjcertificate/site/views/trainingrecord/tmpl/edit.php
@@ -105,7 +105,8 @@ class="p-5"
 	<input type="hidden" name="jform[id]" id="id" value="<?php echo $this->item->id; ?>" />
 	<input type="hidden" name="option" value="com_tjcertificate"/>
 	<input type="hidden" name="task" value="trainingrecord.save"/>
-	<?php echo HTMLHelper::_( 'form.token'); ?>
+	<input type="hidden" name="site" value="f"/>
+	<?php echo HTMLHelper::_('form.token'); ?>
 </form>
 
 <script type="text/javascript">

diff --git a/src/components/com_tjcertificate/tjcertificate.xml b/src/components/com_tjcertificate/tjcertificate.xml
@@ -8,7 +8,7 @@
   <authorEmail>[email protected]</authorEmail>
   <authorUrl>http://techjoomla.com</authorUrl>
   <description />
-  <version>1.0.3</version>
+  <version>1.0.4</version>
   <install>
     <!-- Runs on install -->
     <sql>