From c1ce328dbc9305c41d011896fbbed7d5ac960455 Mon Sep 17 00:00:00 2001
From: Sean Downey <sean@considerweb.com>
Date: Sat, 19 Nov 2011 16:29:47 +0000
Subject: [PATCH] fixes #255 MB: Modify the index and index_alt views generated
 by the Module Builder to use the record->FIELD_NAME rather than a dynamically
 generate list

---
 .../modulebuilder/views/files/view_index.php  | 41 +++++++++++-----
 .../views/files/view_index_alt.php            | 47 ++++++++++++++-----
 2 files changed, 64 insertions(+), 24 deletions(-)

diff --git a/bonfire/application/core_modules/modulebuilder/views/files/view_index.php b/bonfire/application/core_modules/modulebuilder/views/files/view_index.php
index 6e306aeb1..2a52720e9 100755
--- a/bonfire/application/core_modules/modulebuilder/views/files/view_index.php
+++ b/bonfire/application/core_modules/modulebuilder/views/files/view_index.php
@@ -84,20 +84,37 @@
 		<tbody>
 <?php
 foreach ($records as $record) : ?>
-<?php $record = (array)$record;?>
-			<tr>
-<?php
-	foreach($record as $field => $value)
-	{
-		if($field != "'.$primary_key_field.'") {
-?>
-				<td><?php echo ($field == \'deleted\') ? (($value > 0) ? lang(\''.$module_name_lower.'_true\') : lang(\''.$module_name_lower.'_false\')) : $value; ?></td>
+			<tr>';
+for($counter=1; $field_total >= $counter; $counter++)
+{
+	// only build on fields that have data entered. 
 
-<?php
-		}
+	//Due to the requiredif rule if the first field is set the the others must be
+
+	if (set_value("view_field_name$counter") == NULL || set_value("view_field_name$counter") == $primary_key_field)
+	{
+		continue; 	// move onto next iteration of the loop
 	}
-?>
-				<td><?php echo anchor(SITE_AREA .\'/'.$controller_name.'/'.$module_name_lower.'/edit/\'. $record[\''.$primary_key_field.'\'], lang(\''.$module_name_lower.'_edit\'), \'class="ajaxify"\'); ?></td>
+	$view .= '
+				<td><?php echo $record->'.$module_name_lower.'_'.set_value("view_field_name$counter").'?></td>';
+}
+if ($use_soft_deletes == 'true')
+{
+	$view .= '
+				<td><?php echo $record->deleted > 0 ? lang(\''.$module_name_lower.'_true\') : lang(\''.$module_name_lower.'_false\')?></td>';
+}
+if ($use_created == 'true')
+{
+	$view .= '
+				<td><?php echo $record->'.set_value("created_field").'?></td>';
+}
+if ($use_modified == 'true')
+{
+	$view .= '
+				<td><?php echo $record->'.set_value("modified_field").'?></td>';
+}
+$view .= '
+				<td><?php echo anchor(SITE_AREA .\'/'.$controller_name.'/'.$module_name_lower.'/edit/\'. $record->'.$primary_key_field.', lang(\''.$module_name_lower.'_edit\'), \'class="ajaxify"\'); ?></td>
 			</tr>
 <?php endforeach; ?>
 		</tbody>
diff --git a/bonfire/application/core_modules/modulebuilder/views/files/view_index_alt.php b/bonfire/application/core_modules/modulebuilder/views/files/view_index_alt.php
index 42e9b37c6..5d1ca5cc8 100644
--- a/bonfire/application/core_modules/modulebuilder/views/files/view_index_alt.php
+++ b/bonfire/application/core_modules/modulebuilder/views/files/view_index_alt.php
@@ -29,19 +29,9 @@
 		<tbody>
 		
 		<?php foreach (\$records as \$record) : ?>
-			<?php \$record = (array)\$record;?>
 			<tr>
-			<?php foreach(\$record as \$field => \$value) : ?>
-				
-				<?php if (\$field != '{$primary_key_field}') : ?>
-					<td><?php echo (\$field == 'deleted') ? ((\$value > 0) ? lang('{$module_name_lower}_true') : lang('{$module_name_lower}_false')) : \$value; ?></td>
-				<?php endif; ?>
-				
-			<?php endforeach; ?>
-
-				<td>
-					<?php echo anchor(SITE_AREA .'/{$controller_name}/{$module_name_lower}/edit/'. \$record[\$primary_key_field], lang('{$module_name_lower}_edit'), '') ?>
-				</td>
+				{table_records}
+				<td><?php echo anchor(SITE_AREA .'/{$controller_name}/{$module_name_lower}/edit/'. \$record->{$primary_key_field}, lang('{$module_name_lower}_edit'), '') ?></td>
 			</tr>
 		<?php endforeach; ?>
 		</tbody>
@@ -79,7 +69,40 @@
 		<th>Modified</th>';
 }
 
+$table_records = '';
+for($counter=1; $field_total >= $counter; $counter++)
+{
+	// only build on fields that have data entered. 
+
+	//Due to the requiredif rule if the first field is set the the others must be
+
+	if (set_value("view_field_name$counter") == NULL || set_value("view_field_name$counter") == $primary_key_field)
+	{
+		continue; 	// move onto next iteration of the loop
+	}
+	$table_records .= '
+				<td><?php echo $record->'.$module_name_lower.'_'.set_value("view_field_name$counter").'?></td>';
+}
+if ($use_soft_deletes == 'true')
+{
+	$table_records .= '
+				<td><?php echo $record->deleted > 0 ? lang(\''.$module_name_lower.'_true\') : lang(\''.$module_name_lower.'_false\')?></td>';
+}
+if ($use_created == 'true')
+{
+	$table_records .= '
+				<td><?php echo $record->'.set_value("created_field").'?></td>';
+}
+if ($use_modified == 'true')
+{
+	$table_records .= '
+				<td><?php echo $record->'.set_value("modified_field").'?></td>';
+}
+
+
+
 $view = str_replace('{table_header}', $headers, $view);
+$view = str_replace('{table_records}', $table_records, $view);
 
 echo $view;