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 @@
-
-
- $value)
- {
- if($field != "'.$primary_key_field.'") {
-?>
- 0) ? lang(\''.$module_name_lower.'_true\') : lang(\''.$module_name_lower.'_false\')) : $value; ?> |
+
';
+for($counter=1; $field_total >= $counter; $counter++)
+{
+ // only build on fields that have data entered.
-
- |
+ $view .= '
+ '.$module_name_lower.'_'.set_value("view_field_name$counter").'?> | ';
+}
+if ($use_soft_deletes == 'true')
+{
+ $view .= '
+ deleted > 0 ? lang(\''.$module_name_lower.'_true\') : lang(\''.$module_name_lower.'_false\')?> | ';
+}
+if ($use_created == 'true')
+{
+ $view .= '
+ '.set_value("created_field").'?> | ';
+}
+if ($use_modified == 'true')
+{
+ $view .= '
+ '.set_value("modified_field").'?> | ';
+}
+$view .= '
+ '.$primary_key_field.', lang(\''.$module_name_lower.'_edit\'), \'class="ajaxify"\'); ?> |
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 @@
-
- \$value) : ?>
-
-
- 0) ? lang('{$module_name_lower}_true') : lang('{$module_name_lower}_false')) : \$value; ?> |
-
-
-
-
-
-
- |
+ {table_records}
+ {$primary_key_field}, lang('{$module_name_lower}_edit'), '') ?> |
@@ -79,7 +69,40 @@
Modified | ';
}
+$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 .= '
+ '.$module_name_lower.'_'.set_value("view_field_name$counter").'?> | ';
+}
+if ($use_soft_deletes == 'true')
+{
+ $table_records .= '
+ deleted > 0 ? lang(\''.$module_name_lower.'_true\') : lang(\''.$module_name_lower.'_false\')?> | ';
+}
+if ($use_created == 'true')
+{
+ $table_records .= '
+ '.set_value("created_field").'?> | ';
+}
+if ($use_modified == 'true')
+{
+ $table_records .= '
+ '.set_value("modified_field").'?> | ';
+}
+
+
+
$view = str_replace('{table_header}', $headers, $view);
+$view = str_replace('{table_records}', $table_records, $view);
echo $view;