mdd 3.1.2 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab255edf08e646a2ec7de103dafd791b76a0dcbb
-  data.tar.gz: 272da5bcce16ac2e8307f0b37181f3d94748102a
+  metadata.gz: 81a05d7961c4b96740a9ab5dcbb2a40192407282
+  data.tar.gz: 5a9414703485c52c5185ba6fcd8534caa8a44fa2
 SHA512:
-  metadata.gz: aaf0e2552c9ea969af26c3a779fea1f83e6ebfcbb8614a6477ff196facce326f2c392e36361d8e5fe77d873261276d9fb03711c05b613b2f8b9827731ad54e8d
-  data.tar.gz: 6d08505e76a2ae80c8c0e6312d9cb6e0c9e3f2459b4b2ef3544322a34029192c4bf8812a8e8d8693d6f88883eabc852462c704e70830a133e4af675067edae38
+  metadata.gz: 95dabc9bc0f8c76f0a321adc20e41087b98ea0eaa544e0e19302dbfa924be05958b27ffdad87cd433f4c0b2b5df2926e47501277b0f89fe8a1b7afb9c4a46b49
+  data.tar.gz: b6c8911e2e39b8dd326d87c4073b3a44631e67a77c701e143ad223ab061eae505bd4c9e530a3454e739cf7f94e0be4be9de5b06f260357307f6f9d405d5c2e7b

data/app/helpers/mdwa_helper.rb

@@ -21,8 +21,7 @@ module MdwaHelper
   end
 
   def local_url(request, params)
-    glue = !request.url.include?("?") ? "?" : "&"
-    return (request.url + glue + params.select{|k,v| k != :per_page}.collect {|k, v| "#{k}=#{v}"}.join('&'))
+    request.protocol + request.host_with_port + request.path + '?' + params.select{|k,v| k != :per_page}.collect {|k, v| "#{k}=#{v}"}.join('&')
   end
 
   def encode_results_to_autocomplete(results, field_name)

data/lib/generators/mdwa/sandbox/templates/app/assets/javascripts/mdwa/template/batch_update.js

@@ -3,17 +3,19 @@ $(document).ready(function() {
 
     event.preventDefault();
 
-    if( !confirm('Are you sure?') ) return false;
-
     // seleciona os inputs checados
     var input_container = $(this).attr('input_container');
     if($(this).attr('input_container') == null) input_container = '' 
-    if( $(input_container + ' input[type="checkbox"].cid:checked').length == 0 ) return false;
-
     var ids = new Array();
     $(input_container + ' input[type="checkbox"].cid:checked').each(function() {
       ids.push($(this).val());
     });
+    if( ids.length == 0 ) {
+      alert('Select at least one element.');
+      return false;
+    }
+
+    if( !$(this).attr('confirm_batch_update') && !confirm( $(this).attr('confirm_batch_update') ) ) return false;
 
     var url = $(this).attr('href');
     var attribute = $(this).attr('attribute');

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

@@ -169,7 +169,7 @@ class <%= @model.controller_name %>Controller < <%= (@model.space == 'a') ? 'A::
 
   def batch_update
     <%= @model.klass %>.where(id: params[:ids]).each do |<%= @model.singular_name %>|
-      <%= @model.singular_name %>.update_column( params[:attribute], params[:value] )
+      <%= @model.singular_name %>.update_attributes({ params[:attribute] => params[:value] })
     end
 
     @system_notice = t('<%= @model.plural_name %>.notice.batch_update')

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

@@ -1,3 +1,4 @@
 ===entity_code===
 $('#<%= @model.plural_name %>_filter_form').submit();
+$.fancybox.close();
 $('body').append("<%%= j( render '/template/mdwa/notice', :notice => @system_notice )%>");

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

@@ -4,9 +4,10 @@
 		<h1><%%= t '<%= @model.plural_name %>.title.index' %></h1>
 		<div class="page_header_right_tab">
 			<%% if can? :destroy, <%= @model.klass %>  %>
-			<%%= link_to t('<%= @model.plural_name %>.index.remove'), <%= @model.object_name.pluralize %>_batch_update_path, attribute: :removed, value: 1, class: :batch_update %>
+			<%%= link_to t('<%= @model.plural_name %>.index.remove'), <%= @model.object_name.pluralize %>_batch_update_path, attribute: :removed, value: 1, class: :batch_update, confirm_batch_update: t('<%= @model.plural_name %>.index.remove_label') %>
 			<%% end  %>
 
+			<%- if @entity.attributes.select{|name, attr| attr.type.to_sym == :status}.count > 0 -%>
 			<%% if can? :update, <%= @model.klass %>  %>
 			<%- @entity.attributes.select{|name, attr| attr.type.to_sym == :status}.each do |name, attr| -%>
 			  <%- attr.options[:possible_values].each do |value| -%>
@@ -14,6 +15,7 @@
 			  <%- end -%>
 			<%- end -%>
 			<%% end  %>
+			<%- end -%>
 
 		<%- if @entity.ajax -%>
 			<%% if can? :create, <%= @model.klass %>  %>

data/lib/mdwa/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module MDWA
-  VERSION = "3.1.2"
+  VERSION = "3.1.4"
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: mdd
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.4
 platform: ruby
 authors:
 - Marcelo Theodoro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.8
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: cancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
@@ -112,70 +112,70 @@ dependencies:
   name: nested_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.3'
 description: Implements the MDWA approach for Ruby on Rails.
@@ -185,9 +185,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .DS_Store
-- .gitignore
-- .project
+- ".DS_Store"
+- ".gitignore"
+- ".project"
 - Gemfile
 - README.md
 - Rakefile
@@ -533,17 +533,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: mdd
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Model-driven development for Ruby on Rails.