Fixed the dynamicGet ajax to now get field values from the new admin_fields table

README.md

@@ -114,7 +114,7 @@ Component Builder is mapped as a component in itself on my local development env
 + *Version*: 2.5.8
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **123443**
++ *Line count*: **123433**
 + *File count*: **740**
 + *Folder count*: **129**
 

admin/README.txt

@@ -114,7 +114,7 @@ Component Builder is mapped as a component in itself on my local development env
 + *Version*: 2.5.8
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **123443**
++ *Line count*: **123433**
 + *File count*: **740**
 + *Folder count*: **129**
 

admin/assets/css/dynamic_get.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 95 of this MVC
+	@version		@update number 97 of this MVC
-	@build			10th October, 2017
+	@build			12th October, 2017
 	@created		21st May, 2015
 	@package		Component Builder
 	@subpackage		dynamic_get.css

admin/assets/css/dynamic_gets.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 95 of this MVC
+	@version		@update number 97 of this MVC
-	@build			10th October, 2017
+	@build			12th October, 2017
 	@created		21st May, 2015
 	@package		Component Builder
 	@subpackage		dynamic_gets.css

admin/controllers/dynamic_get.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 95 of this MVC
+	@version		@update number 97 of this MVC
-	@build			10th October, 2017
+	@build			12th October, 2017
 	@created		21st May, 2015
 	@package		Component Builder
 	@subpackage		dynamic_get.php

admin/controllers/dynamic_gets.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 95 of this MVC
+	@version		@update number 97 of this MVC
-	@build			10th October, 2017
+	@build			12th October, 2017
 	@created		21st May, 2015
 	@package		Component Builder
 	@subpackage		dynamic_gets.php

admin/models/ajax.php

@@ -499,17 +499,18 @@ class ComponentbuilderModelAjax extends JModelList
 	}
 
 	// Used in dynamic_get
-	public function getViewTableColumns($id, $as, $type)
+	public function getViewTableColumns($admin_view, $as, $type)
 	{
 		// Get a db connection.
 		$db = JFactory::getDbo();
 		 
 		// Create a new query object.
 		$query = $db->getQuery(true);
-		$query->select($db->quoteName(array('addfields', 'name_single')));
+		$query->select($db->quoteName(array('a.addfields', 'b.name_single')));
-		$query->from($db->quoteName('#__componentbuilder_admin_view'));
+		$query->from($db->quoteName('#__componentbuilder_admin_fields', 'a'));
-		$query->where($db->quoteName('published') . ' = 1');
+		$query->join('LEFT', $db->quoteName('#__componentbuilder_admin_view', 'b') . ' ON (' . $db->quoteName('a.admin_view') . ' = ' . $db->quoteName('b.id') . ')');
-		$query->where($db->quoteName('id') . ' = '. $id);
+		$query->where($db->quoteName('b.published') . ' = 1');
+		$query->where($db->quoteName('a.admin_view') . ' = '. (int) $admin_view);
 		 
 		// Reset the query using our newly populated query object.
 		$db->setQuery($query);
@@ -901,21 +902,10 @@ class ComponentbuilderModelAjax extends JModelList
 	
 	protected function getViewName($id)
 	{
-		// Get a db connection.
+		// Get the view name
-		$db = JFactory::getDbo();
+		if ($name = ComponentbuilderHelper::getVar('admin_view', (int) $id, 'id', 'name_single'))
-		 
-		// Create a new query object.
-		$query = $db->getQuery(true);
-		$query->select($db->quoteName(array('name_single')));
-		$query->from($db->quoteName('#__componentbuilder_admin_view'));
-		$query->where($db->quoteName('id') . ' = '. (int) $id);
-		 
-		// Reset the query using our newly populated query object.
-		$db->setQuery($query);
-		$db->execute();
-		if ($db->getNumRows())
 		{
-			return $db->loadResult();
+			return $name;
 		}
 		return '';
 	}

admin/models/dynamic_get.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 95 of this MVC
+	@version		@update number 97 of this MVC
-	@build			10th October, 2017
+	@build			12th October, 2017
 	@created		21st May, 2015
 	@package		Component Builder
 	@subpackage		dynamic_get.php

admin/models/dynamic_gets.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 95 of this MVC
+	@version		@update number 97 of this MVC
-	@build			10th October, 2017
+	@build			12th October, 2017
 	@created		21st May, 2015
 	@package		Component Builder
 	@subpackage		dynamic_gets.php

admin/models/forms/dynamic_get.js

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 95 of this MVC
+	@version		@update number 97 of this MVC
-	@build			10th October, 2017
+	@build			12th October, 2017
 	@created		21st May, 2015
 	@package		Component Builder
 	@subpackage		dynamic_get.js

admin/tables/dynamic_get.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 95 of this MVC
+	@version		@update number 97 of this MVC
-	@build			10th October, 2017
+	@build			12th October, 2017
 	@created		21st May, 2015
 	@package		Component Builder
 	@subpackage		dynamic_get.php

admin/views/dynamic_get/submitbutton.js

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 95 of this MVC
+	@version		@update number 97 of this MVC
-	@build			10th October, 2017
+	@build			12th October, 2017
 	@created		21st May, 2015
 	@package		Component Builder
 	@subpackage		submitbutton.js

admin/views/dynamic_get/tmpl/edit.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 95 of this MVC
+	@version		@update number 97 of this MVC
-	@build			10th October, 2017
+	@build			12th October, 2017
 	@created		21st May, 2015
 	@package		Component Builder
 	@subpackage		edit.php

admin/views/dynamic_get/view.html.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 95 of this MVC
+	@version		@update number 97 of this MVC
-	@build			10th October, 2017
+	@build			12th October, 2017
 	@created		21st May, 2015
 	@package		Component Builder
 	@subpackage		view.html.php

admin/views/dynamic_gets/tmpl/default.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 95 of this MVC
+	@version		@update number 97 of this MVC
-	@build			10th October, 2017
+	@build			12th October, 2017
 	@created		21st May, 2015
 	@package		Component Builder
 	@subpackage		default.php

admin/views/dynamic_gets/tmpl/default_batch_body.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 95 of this MVC
+	@version		@update number 97 of this MVC
-	@build			10th October, 2017
+	@build			12th October, 2017
 	@created		21st May, 2015
 	@package		Component Builder
 	@subpackage		default_batch_body.php

admin/views/dynamic_gets/tmpl/default_batch_footer.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 95 of this MVC
+	@version		@update number 97 of this MVC
-	@build			10th October, 2017
+	@build			12th October, 2017
 	@created		21st May, 2015
 	@package		Component Builder
 	@subpackage		default_batch_footer.php

admin/views/dynamic_gets/tmpl/default_body.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 95 of this MVC
+	@version		@update number 97 of this MVC
-	@build			10th October, 2017
+	@build			12th October, 2017
 	@created		21st May, 2015
 	@package		Component Builder
 	@subpackage		default_body.php

admin/views/dynamic_gets/tmpl/default_foot.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 95 of this MVC
+	@version		@update number 97 of this MVC
-	@build			10th October, 2017
+	@build			12th October, 2017
 	@created		21st May, 2015
 	@package		Component Builder
 	@subpackage		default_foot.php

admin/views/dynamic_gets/tmpl/default_head.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 95 of this MVC
+	@version		@update number 97 of this MVC
-	@build			10th October, 2017
+	@build			12th October, 2017
 	@created		21st May, 2015
 	@package		Component Builder
 	@subpackage		default_head.php

admin/views/dynamic_gets/tmpl/default_toolbar.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 95 of this MVC
+	@version		@update number 97 of this MVC
-	@build			10th October, 2017
+	@build			12th October, 2017
 	@created		21st May, 2015
 	@package		Component Builder
 	@subpackage		default_toolbar.php

admin/views/dynamic_gets/view.html.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 95 of this MVC
+	@version		@update number 97 of this MVC
-	@build			10th October, 2017
+	@build			12th October, 2017
 	@created		21st May, 2015
 	@package		Component Builder
 	@subpackage		view.html.php