ava_scaffold_generator 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/ava_scaffold_generator.rb

@@ -33,6 +33,13 @@ class AvaScaffoldGenerator < Rails::Generator::NamedBase
     else
       @controller_class_name = "#{@controller_class_nesting}::#{@controller_class_name_without_nesting}"
     end
+
+#    attributes.each_with_index{|attribute, i|
+#      def attribute.title
+#        title = @args[i].split(":")[2]
+#      end
+#    }
+
   end
 
   def manifest

data/templates/controller.rb

@@ -4,11 +4,13 @@ class <%= controller_class_name %>Controller < ApplicationController
   def index
     @app_search.default 'id', 'desc'
 
+    @app_search.sort 'id', '<%= plural_name %>.id'
 <% conditions_l = "" -%>
 <% conditions_r = "" -%>
 <% for attribute in attributes -%>
-    @app_search.sort '<%= attribute.name %>', '<%= plural_name %>.<%= attribute.name %>'
-<% conditions_l += "#{plural_name}.#{attribute.name} like ? or " -%>
+<% reference_col = attribute.reference? ? "_id" : "" -%>
+    @app_search.sort '<%= attribute.name %>', '<%= plural_name %>.<%= attribute.name %><%= reference_col %>'
+<% conditions_l += "#{plural_name}.#{attribute.name}#{reference_col} like ? or " -%>
 <% conditions_r += '@app_search.keyword, ' -%>
 <% end -%>
 <% conditions_l = conditions_l.slice(0, conditions_l.size - 3) -%>
@@ -27,7 +29,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.csv  { send_data(xmls.to_csv(<%= class_name %>), :type => "text/csv") }
+      format.csv  { send_data(xmls.to_csv(:instance => <%= class_name %>), :type => "text/csv") }
 #      format.xml  { send_data(xmls.to_xml, :type => "text/xml; charset=utf8;", :disposition => "attachement") }
     end
   end
@@ -39,7 +41,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 
     respond_to do |format|
       format.html # show.html.erb
-      format.csv  { send_data(@<%= file_name %>.to_a.to_csv, :type => "text/csv") }
+      format.csv  { send_data(@<%= file_name %>.to_a.to_csv(:instance => <%= class_name %>), :type => "text/csv") }
 #      format.xml  { send_data(@<%= file_name %>.to_xml, :type => "text/xml; charset=utf8;", :disposition => "attachement") }
     end
   end
@@ -109,6 +111,8 @@ class <%= controller_class_name %>Controller < ApplicationController
       @<%= file_name %> = <%= class_name %>.find(params[:id])
       @<%= file_name %>.destroy
 
+Log.create(:user_id => session_get_user, :action => controller_name, :error => action_name + " " + params[:id])
+
       flash[:notice] = t(:success_deleted, :id => @<%= file_name %>.id)
       redirect_to(<%= file_name %>s_url)
     rescue => e

data/templates/view_check.html.erb

@@ -33,16 +33,19 @@
 <tr>
 <th><%%= f.label :<%= attribute.name %> %></th>
 <td>
-<% if /_id$/ =~ attribute.name -%>
-  <%%= hname @<%= singular_name %>.<%= attribute.name.gsub("_id", "") %> %>
+<% if attribute.reference? -%>
+  <%%= hname @<%= singular_name %>.<%= attribute.name %> %>
+  <%%= f.hidden_field :<%= attribute.name %>_id %>
 <% elsif attribute.field_type == :date_select -%>
   <%%= hdate @<%= singular_name %>.<%= attribute.name %> %>
+  <%%= f.hidden_field :<%= attribute.name %> %>
 <% elsif attribute.field_type == :text_area -%>
   <%%= hbr @<%= singular_name %>.<%= attribute.name %> %>
+  <%%= f.hidden_field :<%= attribute.name %> %>
 <% else -%>
   <%%= h @<%= singular_name %>.<%= attribute.name %> %>
-<% end -%>
   <%%= f.hidden_field :<%= attribute.name %> %>
+<% end -%>
 </td>
 </tr>
 <% end -%>

data/templates/view_confirm.html.erb

@@ -33,16 +33,19 @@
 <tr>
 <th><%%= f.label :<%= attribute.name %> %></th>
 <td>
-<% if /_id$/ =~ attribute.name -%>
-  <%%= hname @<%= singular_name %>.<%= attribute.name.gsub("_id", "") %> %>
+<% if attribute.reference? -%>
+  <%%= hname @<%= singular_name %>.<%= attribute.name %> %>
+  <%%= f.hidden_field :<%= attribute.name %>_id %>
 <% elsif attribute.field_type == :date_select -%>
   <%%= hdate @<%= singular_name %>.<%= attribute.name %> %>
+  <%%= f.hidden_field :<%= attribute.name %> %>
 <% elsif attribute.field_type == :text_area -%>
   <%%= hbr @<%= singular_name %>.<%= attribute.name %> %>
+  <%%= f.hidden_field :<%= attribute.name %> %>
 <% else -%>
   <%%= h @<%= singular_name %>.<%= attribute.name %> %>
-<% end -%>
   <%%= f.hidden_field :<%= attribute.name %> %>
+<% end -%>
 </td>
 </tr>
 <% end -%>

data/templates/view_edit.html.erb

@@ -34,8 +34,8 @@
 <tr>
 <th><%%= f.label :<%= attribute.name %> %></th>
 <td>
-<% if /_id$/ =~ attribute.name -%>
-  <%%= f.collection_select(:<%= attribute.name %>, <%= attribute.name.gsub("_id", "").capitalize  %>.find(:all), :id, :name, :include_blank => true) %>
+<% if attribute.reference? -%>
+  <%%= f.collection_select(:<%= attribute.name %>_id, <%= attribute.name.capitalize  %>.find(:all), :id, :name, :include_blank => true) %>
 <% elsif attribute.field_type == :text_area -%>
   <%%= f.text_area :<%= attribute.name %>, :size => "60x5" %>
 <% elsif attribute.field_type == :check_box -%>

data/templates/view_index.html.erb

@@ -22,7 +22,7 @@
 <!--/ commonBtnArea--></div>
 
 <div class="list">
-<%%= will_paginate @<%= plural_name %> %>
+<%%= paginate_tag @<%= plural_name %> %>
 <%%= counter_tag %>
 <table class="commonList">
 <thead>
@@ -38,7 +38,7 @@
   <tr>
     <td><%%=link_to <%= singular_name %>.id, <%= singular_name %> %></td>
 <% for attribute in attributes -%>
-    <td><%%=h <%= singular_name %>.<%= attribute.name %> %></td>
+    <td><%%=h<%= attribute.reference? ? "name": "" %> <%= singular_name %>.<%= attribute.name %> %></td>
 <% end -%>
   </tr>
 <%% end %>

data/templates/view_new.html.erb

@@ -34,8 +34,8 @@
 <tr>
 <th><%%= f.label :<%= attribute.name %> %></th>
 <td>
-<% if /_id$/ =~ attribute.name -%>
-  <%%= f.collection_select(:<%= attribute.name %>, <%= attribute.name.gsub("_id", "").capitalize  %>.find(:all), :id, :name, :include_blank => true) %>
+<% if attribute.reference? -%>
+  <%%= f.collection_select(:<%= attribute.name %>_id, <%= attribute.name.capitalize  %>.find(:all), :id, :name, :include_blank => true) %>
 <% elsif attribute.field_type == :text_area -%>
   <%%= f.text_area :<%= attribute.name %>, :size => "60x5" %>
 <% elsif attribute.field_type == :check_box -%>

data/templates/view_show.html.erb

@@ -39,14 +39,19 @@
 <tr>
 <th><%%= f.label :<%= attribute.name %> %></th>
 <td>
-<% if attribute.field_type == :date_select -%>
+<% if attribute.reference? -%>
+  <%%= hname @<%= singular_name %>.<%= attribute.name %> %>
+  <%%= f.hidden_field :<%= attribute.name %>_id %>
+<% elsif attribute.field_type == :date_select -%>
   <%%= hdate @<%= singular_name %>.<%= attribute.name %> %>
+  <%%= f.hidden_field :<%= attribute.name %> %>
 <% elsif attribute.field_type == :text_area -%>
   <%%= hbr @<%= singular_name %>.<%= attribute.name %> %>
+  <%%= f.hidden_field :<%= attribute.name %> %>
 <% else -%>
   <%%= h @<%= singular_name %>.<%= attribute.name %> %>
-<% end -%>
   <%%= f.hidden_field :<%= attribute.name %> %>
+<% end -%>
 </td>
 </tr>
 <% end -%>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ava_scaffold_generator
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Masaki Ozawa
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-04 00:00:00 +09:00
+date: 2012-04-12 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency