mdd 3.0.6 → 3.0.7

data/app/controllers/mdwa/requirements_controller.rb

@@ -2,7 +2,10 @@ require 'mdwa/dsl'
 class Mdwa::RequirementsController < Mdwa::MDWAController
   
   def index
-    require_all MDWA::DSL::REQUIREMENTS_PATH
+    # reload the requirements
+    MDWA::DSL.requirements.clear 
+    
+    Dir.glob("#{MDWA::DSL::REQUIREMENTS_PATH}/*.rb").each { |file| load file }
     @requirements = MDWA::DSL.requirements.all
   end
   

data/lib/generators/mdwa/association/association_generator.rb

@@ -22,6 +22,7 @@ module Mdwa
       class_option :with_opposite, :desc => 'Generate the opposite relation too. For example, the oposite of belongs_to is has_many.', :type => :boolean, :default => false
       class_option :skip_rake_migrate, :desc => 'Skips rake db:migrate', :type => :boolean, :default => false
       class_option :skip_migrations, :desc => 'Skips migration files', :type => :boolean, :default => false
+      class_option :skip_models, :desc => 'Skips model code injection', :type => :boolean, :default => false
       class_option :ask, :desc => 'Asks if the opposite should be generated.', :type => :boolean, :default => false
 
       def initialize(*args, &block)
@@ -34,6 +35,9 @@ module Mdwa
       
 
       def model
+        
+        return nil if options.skip_models
+        
         if @association.belongs_to?
           inject_into_class "app/models/#{@association.model1.space}/#{@association.model1.singular_name}.rb", @association.model1.model_class do
             ret = []
@@ -70,7 +74,7 @@ module Mdwa
         end
         if @association.nested_many?
           inject_into_class "app/models/#{@association.model1.space}/#{@association.model1.singular_name}.rb", @association.model1.model_class do
-            # belongs_to
+            # has_many
             # attr_accessible attributes
             # attr_nested_attributes 
             "\n\thas_many :#{@association.model2.plural_name}, :class_name => '#{@association.model2.klass}', :dependent => :destroy\n\tattr_accessible :#{@association.model2.plural_name}_attributes\n\taccepts_nested_attributes_for :#{@association.model2.plural_name}, :allow_destroy => true\n"
@@ -80,20 +84,23 @@ module Mdwa
       end
       
       def migrate
-        unless options.skip_migrations
+        return nil if options.skip_migrations
           
-          @pending_migrations = true
-          case @association.relation.to_sym 
-          when :belongs_to, :nested_one
-            @table = @association.model1
-            @field = @association.model2
-            migration_template 'migrate/one_field.rb', "db/migrate/add_#{@field.singular_name.foreign_key}_to_#{@table.plural_name}.rb"
-          when :has_and_belongs_to_many
+        @pending_migrations = true
+        case @association.relation.to_sym 
+        when :belongs_to, :nested_one
+          @table = @association.model1
+          @field = @association.model2
+          migration_template 'migrate/one_field.rb', "db/migrate/add_#{@field.singular_name.foreign_key}_to_#{@table.plural_name}.rb"
+        when :has_and_belongs_to_many
+          # only generates if table does not exist yet
+          if Dir.glob("db/migrate/*create_#{many_to_many_table_name}.rb").count.zero?
             migration_template 'migrate/many_to_many.rb', "db/migrate/create_#{many_to_many_table_name}.rb"
           else
             @pending_migrations = false
           end
-          
+        else
+          @pending_migrations = false
         end
 
       end

data/lib/generators/mdwa/code/code_generator.rb

@@ -89,7 +89,7 @@ module Mdwa
             entity_attribute = entity.attributes[column.name]
             # model attribute exists, but not in entity -> was erased
             if entity_attribute.nil?
-              @changes << {:entity => entity, :type => 'remove_column', :column => column.name}
+              @changes << {:entity => entity, :type => 'remove_column', :column => column.name, :attr_type => column.type}
             # attribute exists in model and entity, but changed type
             elsif entity_attribute.type.to_sym != column.type.to_sym
               next if entity_attribute.type.to_sym == :file or entity_attribute.type.to_sym == :password
@@ -106,6 +106,14 @@ module Mdwa
             end
           end
           
+          # new foreign keys
+          # belongs_to and nested_one associations that are in the entity, but not database
+          entity.generator_model.associations.select{|a| a.belongs_to? or a.nested_one?}.each do |assoc|
+            if model_class.columns.select{|c| c.name == assoc.model2.singular_name.foreign_key}.count.zero?
+              @changes << {:entity => entity, :type => 'add_column', :column => assoc.model2.name.foreign_key, :attr_type => 'integer'}
+            end
+          end
+          
         end
         
         # generate changed code

data/lib/generators/mdwa/templates/templates/general/routes.rb

@@ -0,0 +1,3 @@
+def mdwa_router(router)
+
+end

data/lib/generators/mdwa/templates/templates/scaffold/controller.rb

@@ -0,0 +1,150 @@
+# -*- encoding : utf-8 -*-
+===entity_code===
+class <%= @model.controller_name %>Controller < <%= (@model.space == 'a') ? 'A::BackendController' : 'ApplicationController' %>
+
+  <%- if @entity.resource? -%>
+  load_and_authorize_resource :class => "<%= @model.klass %>"
+  <%- end -%>
+  
+  # Hook for code generations. Do not delete.
+  #===controller_init===
+
+	def index
+	  @<%= @model.plural_name %> = <%= @model.klass %>.paginate :page => params[:page]
+
+    respond_to do |format|
+      format.html
+      format.js
+    end
+	end
+
+
+	def show
+    @<%= @model.singular_name %> = <%= @model.klass %>.find(params[:id])
+
+  <%- if @entity.ajax? -%>
+    render :layout => false
+  <%- else -%>
+    respond_to do |format|
+      format.html
+    end
+  <%- end -%>
+	end
+
+	def new
+    @<%= @model.singular_name %> = <%= @model.klass %>.new
+    <%- @model.attributes.select {|a| a.nested_one?}.each do |attr| -%>
+    @<%= @model.singular_name %>.<%= attr.type.singular_name %> = <%= attr.type.klass %>.new
+    <%- end -%>
+
+  <%- if @entity.ajax? -%>
+    render :layout => false
+  <%- else -%>
+    respond_to do |format|
+      format.html
+    end
+  <%- end -%>
+	end
+
+	def edit
+    @<%= @model.singular_name %> = <%= @model.klass %>.find(params[:id])
+
+  <%- if @entity.ajax? -%>
+    render :layout => false
+  <%- else -%>
+    respond_to do |format|
+      format.html
+    end
+  <%- end -%>
+	end
+
+	def create
+    @<%= @model.singular_name %> = <%= @model.klass %>.new(params[:<%= @model.to_params %>])
+    saved_ok = @<%= @model.singular_name %>.save
+    @system_notice = t('<%= @model.plural_name %>.create_success') if saved_ok    
+  <%- if @entity.ajax? -%>
+    load_list # loads all <%= @model.plural_name %> to display in the list
+  <%- end -%>
+  
+  <%- @model.associations.select{|a| a.has_and_belongs_to_many? and a.composition?}.each do |association| -%>
+    unless params[:<%= association.model2.plural_name %>].nil?
+      @<%= @model.singular_name %>.<%= association.model2.plural_name %>.clear
+      params[:<%= association.model2.plural_name %>].each do |<%= association.model2.singular_name.foreign_key %>|
+        @<%= @model.singular_name %>.<%= association.model2.plural_name %>.push <%= association.model2.klass %>.find <%= association.model2.singular_name.foreign_key %>
+      end
+    end
+  <%- end -%>
+
+    respond_to do |format|
+    <%- if @entity.ajax? -%>
+      format.js
+    <%- else -%>  
+      if saved_ok
+        format.html { redirect_to <%= @model.object_name.pluralize %>_path, notice: @system_notice }
+      else
+        format.html { render action: "new" }
+      end
+    <%- end -%>
+    end
+	end
+
+	def update
+    @<%= @model.singular_name %> = <%= @model.klass %>.find(params[:id])
+  <%- if @entity.user? -%>
+    # if password is blank, delete from params
+    if params[:<%= @model.object_name %>][:password].blank?
+      params[:<%= @model.object_name %>].delete :password
+      params[:<%= @model.object_name %>].delete :password_confirmation
+    end
+  <%- end -%>
+    saved_ok = @<%= @model.singular_name %>.update_attributes(params[:<%= @model.to_params %>])
+  <%- if @entity.ajax? -%>
+    @system_notice = t('<%= @model.plural_name %>.update_success') if saved_ok
+    load_list # loads all <%= @model.plural_name %> to display in the list
+  <%- end -%>
+  
+  <%- @model.associations.select{|a| a.has_and_belongs_to_many? and a.composition?}.each do |association| -%>
+    unless params[:<%= association.model2.plural_name %>].nil?
+      @<%= @model.singular_name %>.<%= association.model2.plural_name %>.clear
+      params[:<%= association.model2.plural_name %>].each do |<%= association.model2.singular_name.foreign_key %>|
+        @<%= @model.singular_name %>.<%= association.model2.plural_name %>.push <%= association.model2.klass %>.find <%= association.model2.singular_name.foreign_key %>
+      end
+    end
+  <%- end -%>
+    
+    respond_to do |format|
+    <%- if @entity.ajax? -%>
+      format.js
+    <%- else -%>
+      if @<%= @model.singular_name %>.update_attributes(params[:<%= @model.object_name %>])
+        format.html { redirect_to <%= @model.object_name.pluralize %>_path, notice: t('<%= @model.plural_name %>.update_success') }
+      else
+        format.html { render action: "edit" }
+      end
+    <%- end -%>
+    end
+	end
+
+	def destroy
+    @<%= @model.singular_name %> = <%= @model.klass %>.find(params[:id])
+    @system_notice = t('<%= @model.plural_name %>.destroy_success') if @<%= @model.singular_name %>.destroy
+  <%- if @entity.ajax? -%>
+    load_list # loads all <%= @model.plural_name %> to display in the list
+  <%- end -%>
+    
+    respond_to do |format|
+    <%- if @entity.ajax? -%>
+      format.js
+    <%- else -%>
+      format.html { redirect_to <%= @model.object_name.pluralize %>_path, notice: @system_notice }
+    <%- end -%>
+    end
+	end
+	
+	
+	private
+		def load_list
+			@<%= @model.plural_name %> = <%= @model.klass %>.paginate :page => 1
+		end
+
+end

data/lib/generators/mdwa/templates/templates/scaffold/helper.rb

@@ -0,0 +1,3 @@
+===entity_code===
+module <%= @entity.klass %>Helper
+end

data/lib/generators/mdwa/templates/templates/scaffold/model.rb

@@ -0,0 +1,50 @@
+# -*- encoding : utf-8 -*-
+===entity_code===
+class <%= @model.klass %> < <%= !@entity.user? ? 'ActiveRecord::Base' : 'User' %>
+
+<%- # model attributes -%>
+<%- unless @model.attributes.count.zero? -%>
+    attr_accessible <%= @model.attributes.collect {|a| ":" + a.name }.join(', ') %>
+<%- end -%>
+
+<%- if @entity.user? -%>
+  <%- require_all "#{MDWA::DSL::USERS_PATH}#{@entity.file_name}.rb" -%>
+  <%- @roles =  MDWA::DSL.user(@entity.name).nil? ? @roles = [@model.name] : MDWA::DSL.user(@entity.name).user_roles -%>
+  <%- @roles.each do |role| -%>
+    after_create :create_<%= role.underscore %>_permission
+    def create_<%= role.underscore %>_permission
+      <%= role.underscore %>_permission = Permission.find_by_name('<%= role.underscore %>')
+      <%= role.underscore %>_permission = Permission.create(:name => '<%= role.underscore %>') if <%= role.underscore %>_permission.nil?
+      self.permissions.push <%= role.underscore %>_permission
+    end
+  <%- end -%>
+<%- end -%>
+  
+<%- # model associations -%>
+<%- @model.associations.each do |association| -%>
+  <%- if association.belongs_to? -%>
+    belongs_to :<%= association.model2.singular_name %>, :class_name => '<%= association.model2.klass %>'
+    attr_accessible :<%= association.model2.singular_name.foreign_key %>
+  <%- end -%>
+  <%- if association.has_one? -%>
+    has_one :<%= association.model2.singular_name %>, :class_name => '<%= association.model2.klass %>'
+  <%- end -%>
+  <%- if association.has_many? -%>
+    has_many :<%= association.model2.plural_name %>, :class_name => '<%= association.model2.klass %>'
+  <%- end -%>
+  <%- if association.has_and_belongs_to_many? -%>
+    has_and_belongs_to_many :<%= association.model2.plural_name %>, :join_table => :<%= association.ordered.first.plural_name %>_<%= association.ordered.last.plural_name %>
+  <%- end -%>
+  <%- if association.nested_one? -%>
+    belongs_to :<%= association.model2.singular_name %>, :class_name => '<%= association.model2.klass %>'
+    attr_accessible :<%= association.model2.singular_name %>_attributes, :<%= association.model2.singular_name.foreign_key %>
+    accepts_nested_attributes_for :<%= association.model2.singular_name %>, :allow_destroy => true
+  <%- end -%>
+  <%- if association.nested_many? -%>
+    has_many :<%= association.model2.plural_name %>, :class_name => '<%= association.model2.klass %>', :dependent => :destroy
+    attr_accessible :<%= association.model2.plural_name %>_attributes
+    accepts_nested_attributes_for :<%= association.model2.plural_name %>, :allow_destroy => true
+  <%- end -%>
+<%- end -%>
+  
+end

data/lib/generators/mdwa/templates/templates/scaffold/views/_form.html.erb

@@ -0,0 +1,23 @@
+===entity_code===
+<%%= <%= 'nested_' unless @model.attributes.select{|a| a.nested_many?}.count.zero? %>form_for(<%= @model.to_route_object('@') %><%= ', :remote => true, :html => {:class => :mdwa_ajax}' if @entity.ajax %>) do |f| %>
+
+	<div id="mdwa_error">
+	   	<%%= render '/template/mdwa/crud_error', :object => @<%= @model.singular_name %> %>
+	</div>
+	
+	<div class="yui3-g">
+		<div class="yui3-u">
+			<%%= render 'form_fields', :f => f %>
+  	  	</div>
+	</div>
+
+	<div class="actions">
+		<%- if !@entity.ajax -%>
+		<%%= link_to t('system.cancel_button'), <%= @model.object_name.pluralize %>_path, :class => :cancel %> 
+		<%- else -%>
+		<%%= link_to t('system.cancel_button'), '#', :class => :cancel %> 
+		<%- end -%>
+	    <%%= f.submit :class => :button %>
+	</div>
+
+<%% end %>

data/lib/generators/mdwa/templates/templates/scaffold/views/_form_fields.html.erb

@@ -0,0 +1,45 @@
+===entity_code===
+<%- @model.attributes.each do |attr| -%>
+<div class="field">
+   	<%%= f.label :<%= attr.name %> %> 
+   	<%%= f.<%= attr.form_field %> :<%= attr.name %> %>
+</div>
+<%- end # model.attributes.each -%>
+
+<%- @model.associations.each do |assoc| -%>
+<%- if assoc.belongs_to? -%>
+<div class="field">
+	<%%= f.label :<%= assoc.model2.singular_name.foreign_key %> %> 
+	<%%= f.select :<%= assoc.model2.singular_name.foreign_key %>, 
+		  options_for_select( <%= assoc.model2.klass %>.order('<%= assoc.reference_field %> ASC').collect{ |c| [c.<%= assoc.reference_field %>, c.id] }, f.object.<%= assoc.model2.singular_name.foreign_key %> ), 
+			:prompt => '-- Select --' %>
+</div>
+<%- end # if -%>
+
+<%- if assoc.has_and_belongs_to_many? and assoc.composition? -%>
+<div class="nested">
+	<%%- <%= assoc.model2.klass %>.order('<%= assoc.reference_field %> ASC').each do |<%= assoc.model2.singular_name %>| -%>
+	<div class="checkbox">
+		<%%= check_box_tag '<%= assoc.model2.plural_name %>[]', <%= assoc.model2.singular_name %>.id, (@<%= @model.singular_name %>.<%= assoc.model2.plural_name %>.include?(<%= assoc.model2.singular_name %>) ? true : false) %>
+		<span><%%= <%= assoc.model2.singular_name %>.<%= assoc.reference_field %> %></span>
+	</div>
+	<%%- end -%>
+</div>
+<%- end -%>
+
+<%- if assoc.nested? -%>
+<div class="nested">
+	<%%= f.fields_for :<%= (assoc.nested_many?) ? assoc.model2.plural_name : assoc.model2.singular_name %> do |ff| %>
+		<%%= render '<%= assoc.model2.space %>/<%= assoc.model2.plural_name %>/form_fields', :f => ff %>
+	<%- unless assoc.nested_one? -%>
+		<%%= ff.link_to_remove t('nested.remove') %>
+	<%- end -%>
+	
+	<%% end %>
+	<%- unless assoc.nested_one? -%>
+	<%%= f.link_to_add t('nested.add', :name => '<%= assoc.model2.singular_name %>'), :<%= assoc.model2.plural_name %> %>
+	<%- end -%>
+</div>
+<%- end # if -%>
+
+<%- end # associations loop -%>

data/lib/generators/mdwa/templates/templates/scaffold/views/_list.html.erb

@@ -0,0 +1,47 @@
+===entity_code===
+<table class="list">
+  <thead>
+      <th class="list_show"><%%= t 'system.index_id' %></th>
+      <th class="list_edit"><%%= t 'system.index_edit' %></th>
+    <%- @model.attributes.each do |attr| -%>
+      <th><%%= t '<%= @model.plural_name %>.index_<%= attr.name %>' %></th>
+    <%- end -%>
+    <%- @model.associations.each do |assoc| -%>
+      <th><%%= t '<%= @model.plural_name %>.index_<%= assoc.model2.singular_name %>' %></th>
+    <%- end -%>
+      <th class="list_remove"><%%= t 'system.index_remove' %></th>
+  </thead>
+
+<%% @<%= @model.plural_name %>.each do |<%= @model.singular_name %>| %>
+  <tr class="<%%= cycle 'odd_line', 'even_line' %>" >
+    <td>
+		<%%= link_to <%= @model.singular_name %>.id, <%= @model.object_name %>_path(<%= @model.singular_name %>) <%= ", :class => 'lightbox various fancybox.ajax'" if @entity.ajax %> %>
+	</td>
+  	<td>
+		<%%= link_to t('system.index_edit_label'), edit_<%= @model.object_name %>_path(<%= @model.singular_name %>) <%= ", :class => 'lightbox various fancybox.ajax'" if @entity.ajax %> %>
+	</td>
+    <%- @model.attributes.each do |attr| -%>
+	<td><%%= <%= @model.singular_name %>.<%= attr.name %> %></td>
+	<%- end -%>
+		
+	<%- @model.associations.each do |assoc| -%>
+    <td>
+      <%- if assoc.belongs_to? || assoc.nested_one? || assoc.has_one? -%>
+        <%%= <%= @model.singular_name %>.<%= assoc.model2.singular_name %>.<%= assoc.reference_field %> unless <%= @model.singular_name %>.<%= assoc.model2.singular_name %>.nil? %>
+      <%- elsif assoc.has_many? or assoc.has_and_belongs_to_many? or assoc.nested_many? -%>
+        <ul>
+        <%% <%= @model.singular_name %>.<%= assoc.model2.plural_name %>.each do |<%= assoc.model2.singular_name %>| %>
+          <li><%%= <%= assoc.model2.singular_name %>.<%= assoc.reference_field %> %> </li>
+        <%% end %>
+        </ul>
+      <%- end -%>
+    </td>
+    <%- end -%>
+    <td>
+		<%%= link_to t('system.index_remove_label'), <%= @model.to_route_object %>, :method => :delete, <%= ':remote => true,' if @entity.ajax %> :data => {:confirm => t('system.index_confirm_deletion')} %>
+	</td>
+  </tr>
+<%% end %>
+</table>
+
+<%%= pagination_footer @<%= @model.plural_name %> %>

data/lib/generators/mdwa/templates/templates/scaffold/views/create.js.erb

@@ -0,0 +1,8 @@
+===entity_code===
+<%% if @<%= @model.singular_name %>.errors.any? %>
+	$("#mdwa_error").html("<%%= escape_javascript( render '/template/mdwa/crud_error', :object => @<%= @model.singular_name %> )%>");
+<%% else %>
+	$.fancybox.close(true);
+	$("#<%= @model.plural_name %>_list").html("<%%= j( render 'list' )%>");
+	$('body').append("<%%= j( render '/template/mdwa/notice', :notice => @system_notice )%>");
+<%% end %>

data/lib/generators/mdwa/templates/templates/scaffold/views/destroy.js.erb

@@ -0,0 +1,3 @@
+===entity_code===
+$("#<%= @model.plural_name %>_list").html("<%%= j( render 'list' )%>");
+$('body').append("<%%= escape_javascript( render '/template/mdwa/notice', :notice => @system_notice )%>");

data/lib/generators/mdwa/templates/templates/scaffold/views/edit.html.erb

@@ -0,0 +1,10 @@
+===entity_code===
+<div id="<%= @model.plural_name %>_edit" class="mdwa_edit">
+	<div class="page_header">
+		<h1><%%= t('<%= @model.plural_name %>.edit_title') %></h1>
+	</div>
+
+	<div class="inside">
+		<%%= render 'form' %>
+	</div>
+</div>

data/lib/generators/mdwa/templates/templates/scaffold/views/index.html.erb

@@ -0,0 +1,17 @@
+===entity_code===
+<div id="<%= @model.plural_name %>_index" class="mdwa_index">
+	<div class="page_header">
+		<h1><%%= t '<%= @model.plural_name %>.index_title' %></h1>
+		<%- if @entity.ajax -%>
+		<div class="page_header_right_tab">
+			<%%= link_to t('system.add_by_ajax', :name => '<%= @model.singular_name.humanize %>'), new_<%= @model.object_name %>_path, :class => 'lightbox various fancybox.ajax' %>
+		</div>
+		<%- end -%>
+	</div>
+
+	<div class="inside">
+		<div id="<%= @model.plural_name %>_list">
+			<%%= render 'list' %>
+		</div>
+	</div>
+</div>

data/lib/generators/mdwa/templates/templates/scaffold/views/index.js.erb

@@ -0,0 +1,2 @@
+===entity_code===
+$("#<%= @model.plural_name %>_list").html("<%%= escape_javascript( render 'list' )%>");

data/lib/generators/mdwa/templates/templates/scaffold/views/new.html.erb

@@ -0,0 +1,10 @@
+===entity_code===
+<div id="<%= @model.plural_name %>_new" class="mdwa_new">
+	<div class="page_header">
+		<h1><%%= t('<%= @model.plural_name %>.new_title') %></h1>
+	</div>
+
+	<div class="inside">
+		<%%= render 'form' %>
+	</div>
+</div>

data/lib/generators/mdwa/templates/templates/scaffold/views/show.html.erb

@@ -0,0 +1,31 @@
+===entity_code===
+<div id="<%= @model.plural_name %>_show" class="mdwa_show">
+	<div class="page_header">
+		<h1><%%= t('<%= @model.plural_name %>.show_title') %></h1>
+	</div>
+
+	<div class="inside">
+	<%- @model.attributes.each do |attr| -%>
+		<div class="field">
+			<label><%%= t '<%= @model.plural_name %>.show_<%= attr.name %>' %></label>
+			<span><%%= @<%= @model.singular_name %>.<%= attr.name %> %></span>
+		</div>
+	<%- end -%>
+	<%- @model.associations.each do |assoc| -%>
+		<div class="field">
+			<label><%%= t '<%= @model.plural_name %>.show_<%= assoc.model2.singular_name %>' %></label>
+			<span>
+			<%- if assoc.belongs_to? || assoc.nested_one? -%>
+		    	<%%= @<%= @model.singular_name %>.<%= assoc.model2.singular_name %>.<%= assoc.reference_field %> unless @<%= @model.singular_name %>.<%= assoc.model2.singular_name %>.nil? %>
+		    <%- elsif assoc.has_many? or assoc.nested_many? -%>
+		        <ul>
+		    	<%% @<%= @model.singular_name %>.<%= assoc.model2.plural_name %>.each do |<%= assoc.model2.singular_name %>| %>
+		   	    	<li><%%= <%= assoc.model2.singular_name %>.<%= assoc.reference_field %> %> </li>
+		    	<%% end %>
+		        </ul>
+		    <%- end -%>		    
+			</span>
+		</div>
+	<%- end -%>
+	</div>
+</div>

data/lib/generators/mdwa/templates/templates/scaffold/views/update.js.erb

@@ -0,0 +1,13 @@
+===entity_code===
+<%% if @<%= @model.singular_name %>.errors.any? %>
+	$("#mdwa_error").html("<%%= escape_javascript( render '/template/mdwa/crud_error', :object => @<%= @model.singular_name %> )%>");
+<%% else %>
+	if( $('#<%= @model.plural_name %>_list').length > 0 ) {
+		$.fancybox.close(true);
+		$("#<%= @model.plural_name %>_list").html("<%%= j( render 'list' )%>");
+	}
+	else if( $("#edit_<%= @model.plural_name %>").length > 0 ) {
+		$("#edit_<%= @model.plural_name %> .inside").html("<%%= j( render 'form' )%>");
+	}
+	$('body').append("<%%= j( render '/template/mdwa/notice', :notice => @system_notice )%>");
+<%% end %>