cowtech-rails 1.4.1.0 → 1.5.0.0

data/app/helpers/cowtech/ruby_on_rails/helpers/crud_helper.rb

@@ -107,7 +107,7 @@ module Cowtech
           search = "(@#{search}@)"
           search.gsub!(/(\s+(AND|OR|NOT)\s+)/, "@) \\1 (@")
 
-          # SOSTITUIAMO I PARAMETRI
+          # SUBSTITUTE PARAMETERS
           i = -1
           parameters = {}
           search.gsub!(/@(.+?)@/) do |s|
@@ -116,7 +116,7 @@ module Cowtech
             key = "search_parameter_#{i}".to_sym
             val = $1
 
-            # GESTIAMO I MARCATORI DI INIZIO E FINE RIGA
+            # HANDLE LINE MARKERS
             if val =~ /^\^.+\$$/ then
               val = "#{val.gsub(/^\^(.+)\$$/, "\\1").strip}"
             elsif val =~ /^\^/ then
@@ -144,20 +144,20 @@ module Cowtech
           self.crud_query_initialize(data) unless data[:query_initialized]
           parameter = :search unless parameter
 
-          self.crud_query_add_condition(data, "(#{self.crud_get_class(data).table_name}.eliminato = :eliminato)", {:eliminato => false}) unless data[:skip_eliminato]
+          self.crud_query_add_condition(data, "(#{self.crud_get_class(data).table_name}.#{self.crud_get_class(data).deleted_column} = :deleted)", {:deleted => false}) unless data[:skip_deleted]
 
-          # OTTENIAMO LA QUERY
+          # GET QUERY
           args = params[parameter] unless args
 
           unless args.blank? then
             search, parameters = self.crud_query_parse_search(args)
 
-            # COMPONIAMO LA QUERY
+            # BUILD QUERY
             data[:query_params].merge!(parameters)
             search_query = []
             fields.each do |field| search_query << "(#{search.gsub("@FIELD@", field.to_s)})" end
 
-            # ADESSO AGGIUNGIAMO I CAMPI ADDIZIONALI
+            # ADD OPTIONAL DATA
             if externals then
               externals.each do |external|
                 external_query = ""
@@ -193,14 +193,14 @@ module Cowtech
 
         def crud_form_header(female = false)
           if self.crud_get_form_data.new_record? then 
-            "Crea nuov#{if female then "a" else "o" end}"
+            "Create new"
           else
-            "Modifica"
+            "Edit"
           end
         end
 
         def crud_form_submit_label
-          if self.crud_get_form_data.new_record? then "Inserisci" else "Modifica" end
+          if self.crud_get_form_data.new_record? then "Create" else "Edit" end
         end
 
         def crud_get_page_param(key = :page, upperbound = -1)
@@ -219,8 +219,8 @@ module Cowtech
           sf = sort_by.split("-")
           rv = OpenStruct.new({:what => mo["what"], :how => mo["how"].upcase})
 
-          # ADATTIAMO ALCUNI PARAMETRI
-          rv.what = "stato_id" if rv.what == "stato"
+          # ADAPT SOME PARAMETERS
+          rv.what = "status_id" if rv.what == "status"
 
           rv
         end
@@ -280,7 +280,7 @@ module Cowtech
 
           if record then
             if only_check then
-              record.deletable?(controller.authenticated_user)
+              record.deletable?
             else
               record.delete
             end

data/app/models/cowtech/ruby_on_rails/models/model_base.rb

@@ -8,6 +8,18 @@ module Cowtech
   module RubyOnRails
     module Models
       class ModelBase < ::ActiveRecord::Base
+        def deleted_column
+          "deleted"
+        end
+        
+        def status_column
+          "status_id"
+        end
+        
+        def self.deleted_status_id
+          0
+        end
+        
         def safe_id
           if self.id then self.id else 0 end
         end
@@ -19,9 +31,27 @@ module Cowtech
         def deletable?(user = nil)
           true
         end
-  
+        
         def delete(definitive = false)
-          super()
+          if !definitive then
+            if self.deletable? then
+              if self.respond_to?(self.deleted_column) then
+                self.send(self.deleted_column, true)
+                self.save
+                true
+              elsif self.respond_to?(self.status_column) then
+                self.send(self.status_column, self.deleted_status)
+                self.save
+                true
+              else
+                super()
+              end
+            else
+              false
+            end
+          else
+            super()
+          end
         end
       end
     end

data/lib/cowtech/extensions.rb

@@ -62,7 +62,7 @@ module Cowtech
         end
 
         def format_boolean
-          self.to_boolean ? "Sì" : "No"
+          self.to_boolean ? "Yes" : "No"
         end
   
         def dump
@@ -204,11 +204,11 @@ module Cowtech
           format = self.class.custom_format($1) if format =~ /^custom::(.+)/    
           unlocal = self.strftime(format || self.class.custom_format("update"))
     
-          # SCAMBIAMO I MESI E I GIORNI COMPLETI
+          # CHANGE LONG DAYS AND MONTHS
           unlocal.gsub!(/(#{self.class.localized_months.keys.join("|")})/i) do |s| self.class.localized_months[$1] end
           unlocal.gsub!(/(#{self.class.localized_days.keys.join("|")})/i) do |s| self.class.localized_days[$1] end
 
-          # SCAMBIAMO I MESI E I GIORNI CORTI
+          # CHANGE SHORT DAYS AND MONTHS
           unlocal.gsub!(/(#{self.class.localized_short_months.keys.join("|")})/i) do |s| self.class.localized_short_months[$1] end
           unlocal.gsub!(/(#{self.class.localized_short_days.keys.join("|")})/i) do |s| self.class.localized_short_days[$1] end
 

data/lib/cowtech/version.rb

@@ -8,8 +8,8 @@ module Cowtech
   module Rails
     module Version
       MAJOR = 1
-      MINOR = 4
-      PATCH = 1
+      MINOR = 5
+      PATCH = 0
       BUILD = 0
 
       STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

metadata

@@ -4,10 +4,10 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 4
-  - 1
+  - 5
+  - 0
   - 0
-  version: 1.4.1.0
+  version: 1.5.0.0
 platform: ruby
 authors: 
 - Shogun