asf_scaffold_generator 0.0.6 → 0.0.7

data/templates/asf_view_list.rhtml

@@ -54,11 +54,11 @@
   <%% for column_name in columns; column = <%= model_name %>.columns_hash[column_name.to_s] %>
   	<%% value = <%= singular_name %>.send(column.name) %>
     <td class='dataCell'>  	
-	  	<%% unless column.reference_to %>
-	    	<%%= value ? link_to(value, :action => 'show', :id => <%= singular_name %>) : '&nbsp;' %>
-	  	<%% else %>
+	  	<%% if column.respond_to?(:reference_to) and column.reference_to %>
 	    	<%%= value ? link_to(column.reference_to, 
 	    	{ :controller => column.reference_to.pluralize.underscore, :action=> 'show', :id => value }) : '&nbsp;' %>
+	  	<%% else %>
+	    	<%%= value ? link_to(value, :action => 'show', :id => <%= singular_name %>) : '&nbsp;' %>
 	  	<%% end %>
   	</td>  
   <%% end %>

data/templates/asf_view_show.rhtml

@@ -1,39 +1,39 @@
+<% def safe_array(value)
+     if value.is_a? Array 
+       value
+     else 
+       value.nil? ? [] : [ value ] 
+     end
+   end
+%>
 <% model = model_name.constantize
    connection = model.connection
    entity_name = connection.entity_name_from_table(model.table_name)
    entity_def = connection.get_entity_def(entity_name)
-   layouts = entity_def.layouts 
+   layoutMetadata = entity_def.layouts
 %>
 <div class="bPageBlock secondaryPalette" id="ep"><div class="pbHeader">
 <div class="pbBody"><div class="pbSubsection">
 <table class="detailList">
-  <% layouts[:layouts][:detailLayoutSections].each do |section| 
-      rows = section[:layoutRows]
-      rows = [ rows ] unless rows.is_a? Array
-      rows.each do | row |
+  <% safe_array(layoutMetadata[:layouts]).each do |layout|
+       safe_array(layout[:detailLayoutSections]).each do |section| 
+         safe_array(section[:layoutRows]).each do | row |
   %>
   <tr>
-    <% items = row[:layoutItems]
-       items = [ items ] unless items.is_a? Array
-       items.each do | item |
-    %>
+    <% safe_array(row[:layoutItems]).each do | item | %>
     <td class="labelCol"><%= item[:label] %></td>
-      <% components = item[:layoutComponents]
-         components = [ components ] unless components.is_a? Array
-      %>    
       <td class="dataCol col02">
-        <% components.each do |component|
-             next if component.nil?
+        <% safe_array(item[:layoutComponents]).each do |component|
              if component[:type] == "Field"
                field = component[:value]
                column = entity_def.api_name_to_column[field]
 
 			   col_ref = "@#{singular_name}.#{column.name}"       
-               unless column.reference_to 
+               if column.respond_to?(:reference_to) and column.reference_to 
         %>
-	    <%%=      <%= col_ref %> ? <%= col_ref %> : '&nbsp;' %>
+	    <%%=     <%= col_ref %> ? link_to(<%= col_ref %>, { :controller => '<%= column.reference_to.pluralize.underscore %>', :action=> 'show', :id => <%= col_ref %> }) : '&nbsp;' %>
 	  	<%     else %>
-	    <%%=      <%= col_ref %> ? link_to(<%= col_ref %>, { :controller => '<%= column.reference_to.pluralize.underscore %>', :action=> 'show', :id => <%= col_ref %> }) : '&nbsp;' %>
+	    <%%=     <%= col_ref %> ? <%= col_ref %> : '&nbsp;' %>
 	  	<%     end        
              end
            end
@@ -43,6 +43,7 @@
     </tr>
 <%    end
     end
+  end
 %>
 </table>
 </div></div>

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: asf_scaffold_generator
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
-date: 2006-02-26 00:00:00 -05:00
+  version: 0.0.7
+date: 2006-02-27 00:00:00 -05:00
 summary: ActiveSalesforce Generator provides additional salesforce aware scaffolding support.
 require_paths: 
 - lib