getListingColumns bug fix

dwijitsolutions · Nov 22, 2016 · 74eb44a · 74eb44a
1 parent 0cc9fb1
commit 74eb44a
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/src/Models/Module.php b/src/Models/Module.php
@@ -1358,7 +1358,7 @@ public static function setDefaultFieldRoleAccess($field_id, $role_id, $access_ty
 	* 
 	* ModuleFields::getModuleFields('Employees')
 	**/
-	public static function getListingColumns($module_id_name) {
+	public static function getListingColumns($module_id_name, $isObjects = false) {
 		$module = null;
 		if(is_int($module_id_name)) {
 			$module = Module::get($module_id_name);
@@ -1367,12 +1367,19 @@ public static function getListingColumns($module_id_name) {
 		}
 		$listing_cols = ModuleFields::where('module', $module->id)->where('listing_col', 1)->orderBy('sort', 'asc')->get()->toArray();
 
-		$listing_cols_temp = array('id');
+		if($isObjects) {
+			$id_col = array('label' => 'id', 'colname' => 'id');
+		} else {
+			$id_col = 'id';
+		}
+		$listing_cols_temp = array($id_col);
 		foreach ($listing_cols as $col) {
-			if($col['colname'] == 'id') {
-				$listing_cols_temp[] = $col['colname'];
-			} else if(Module::hasFieldAccess($module->id, $col['id'])) {
-				$listing_cols_temp[] = $col['colname'];
+			if(Module::hasFieldAccess($module->id, $col['id'])) {
+				if($isObjects) {
+					$listing_cols_temp[] = $col;
+				} else {
+					$listing_cols_temp[] = $col['colname'];
+				}
 			}
 		}
 		return $listing_cols_temp;