foldscaf 1.0.1 → 1.0.2

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.0.2
+* Eliminar! pasa a ser destroy (nuevo formato)
+* Headers de Index, New y Edit con nuevo formato.
+* disable_with y confirm ahora con :data => {}
+* default_scope con nuevo formato
+
 ## v1.0.1
 * Eliminado método mensaje de admin_controller. (Está en ApplicationController de XaverTemplate >= 1.0.1)
 

data/lib/generators/fold/templates/admin_controller.erb

@@ -35,7 +35,7 @@ class Admin::<%= @classes %>Controller < Admin::AdminController
 
   def destroy
     @id = @<%= @singular %>.id
-    @<%= @singular %>.eliminar!
+    @<%= @singular %>.destroy
     notice = mensaje
 
     respond_to do |format|

data/lib/generators/fold/templates/model.erb

@@ -7,10 +7,18 @@ class <%= @class %> < ActiveRecord::Base
 <%- atributos_con_referencia.each do |a| -%>
   belongs_to :<%= a.nombre %>
 <%- end -%>
-  default_scope where(:es_activo => true)<%= ".order('#{@plural}.orden')" if @con_orden %>
+  default_scope -> { where{es_activo.eq true}<%= ".order('#{@plural}.orden')" if @con_orden %> }
 
-  def eliminar!
-    update_attributes! :es_activo => false
+  def se_puede_eliminar?
+    true
+  end
+  
+  def destroy
+    if se_puede_eliminar?
+      run_callbacks :destroy do
+        update_attribute :es_activo, false
+      end
+    end
   end
 
   alias_attribute :to_s, :<%= @identificador %>

data/lib/generators/fold/templates/views/_form.erb

@@ -4,6 +4,6 @@
 <%- end -%>
 
   <div class="controls">
-    <%%= f.button :submit, :name => nil, :disable_with => t("espere"), :class => 'btn btn-primary' %>
+    <%%= f.button :submit, :name => nil, :data => { :disable_with => t('espere') }, :class => 'btn btn-primary' %>
   </div>
 <%% end %>

data/lib/generators/fold/templates/views/edit.erb

@@ -1,10 +1,8 @@
 <div class="page-header">
-  <div class="row">
-    <div class="span6"><h1>Editar <%= @class %></h1></div>
-    <div class="span3" style="text-align:right;">
-      <%%= link_to icono('arrow-left', :blanco) + ' Volver', <%= @plural_path %>, :class => 'btn btn-primary btn-large' %>
-    </div>
-  </div>
+  <nav class="pull-right">
+    <%%= link_to icono('arrow-left', :blanco) + ' Volver', <%= @plural_path %>, :class => 'btn btn-primary btn-large' %>
+  </nav>
+  <h1>Editar <%= @class %></h1>
 </div>
 
 <%%= render "form", :<%= @singular %> => @<%= @singular %>, :url => <%=  @singular_path %>(@<%= @singular %>), :remote => false %>

data/lib/generators/fold/templates/views/index.erb

@@ -1,8 +1,8 @@
 <div class="page-header">
-  <div class="row">
-    <div class="span6"><h1><%= @classes %></h1></div>
-    <div class="span3" style="text-align:right;"><%%= link_to icono('plus', :blanco) + " Agregar <%= @singular %>", <%= @new_path %>, :class => 'btn btn-primary btn-large' %></div>
-  </div>
+  <nav class="pull-right">
+    <%%= link_to icono('plus', :blanco) + " Agregar <%= @singular %>", <%= @new_path %>, :class => 'btn btn-primary btn-large' %>
+  </nav>
+  <h1><%= @classes %></h1>
 </div>
 
 <%%= simple_form_for @q, :as => :q, :url => <%= @plural_path %>, :method => :get do |f| %>

data/lib/generators/fold/templates/views/new.erb

@@ -1,10 +1,8 @@
 <div class="page-header">
-  <div class="row">
-    <div class="span6"><h1>Agregar <%= @class %></h1></div>
-    <div class="span3" style="text-align:right;">
-      <%%= link_to icono('arrow-left', :blanco) + ' Volver', <%= @plural_path %>, :class => 'btn btn-primary btn-large' %>
-    </div>
-  </div>
+  <nav class="pull-right">
+    <%%= link_to icono('arrow-left', :blanco) + ' Volver', <%= @plural_path %>, :class => 'btn btn-primary btn-large' %>
+  </nav>
+  <h1>Agregar <%= @class %>
 </div>
 
 <%%= content_tag :table, :id => nombre_tabla(<%= @class %>), :class => [:table, :"table-striped", :ordenable] do %>

data/lib/generators/fold/templates/views/nombre.erb

@@ -5,6 +5,7 @@
     <%%= link_to icono('move', :black) + " Mover", "#", :class => 'btn btn-mini handle', :title => 'Mantenga click y arrastre para reordenar' %>
 <%- end -%>
     <%%= link_to 'Editar', <%= @edit_path %>(<%= @singular %>), :class => 'btn btn-mini' if can? :update, <%= @singular %> %>
-    <%%= link_to "Eliminar", <%= @singular_path %>(<%= @singular %>), :method => :delete, :confirm => t("confirmacion"), :remote => true, :class => 'btn btn-mini btn-danger' if can? :destroy, <%= @singular %> %>
+    <%%= link_to 'Eliminar', <%= @singular_path %>(<%= @singular %>), :method => :delete, :data => { :confirm => t('confirmacion') }, :remote => true, :class => 'btn btn-mini btn-danger' 
+if <%= @singular %>.se_puede_eliminar? && can?(:destroy, <%= @singular %>) %>
   </td>
 <%% end %>

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Foldscaf
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foldscaf
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-12 00:00:00.000000000Z
+date: 2012-07-04 00:00:00.000000000 Z
 dependencies: []
 description: Generadores adaptados a las necesidades de Xaver
 email:
@@ -59,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: foldscaf
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Generadores adaptados a las necesidades de Xaver