hobo_rapid 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7572196f26e54e4873b8bbc0f47dba3622c4fb8
-  data.tar.gz: 2c7ec48b0d13d00df65523bee4e083d98f424431
+  metadata.gz: 9c315bf6c9cc975bbb615c85cf9bbf1f7f64b3b8
+  data.tar.gz: 41b597e0a0e35c44ca514f18e99f6b3a8fd59b66
 SHA512:
-  metadata.gz: b8865f8373ddb01749042e848b45f9625db791cc3f1233e430bce1b452aa755bb1042e5086d11da0735b2ac25f2faab4fbec661898ead4a8a54c17b8bf0c4f09
-  data.tar.gz: f24803c9b53f9d0ccaab34e555637b557cd4fe11a2e51851964dc3bb049ca33b9c54dda01f1aec4e97a8aff456913763fe4eb81553eccfe3273c6efbebf259f9
+  metadata.gz: 26ab08c92cdb76ec208f9b04d936ce93e641cefa3fbf1706a14a1393f9c266f036dac7d647379055d7e7c1910973c4737a094d21e524cd405ce0801b2c88f1cc
+  data.tar.gz: 2130965d96ba503771c857c4085f4390b040255fa8df5e992033e920ade5d6c2c730db298d44a30d516a200eb1a77702e874d85697b7baa798cf3dfc05fd4c20

data/VERSION

@@ -1 +1 @@
-2.1.1
+2.1.2

data/taglibs/buttons/delete-button.dryml

@@ -54,8 +54,7 @@ All the standard ajax attributes *except the callbacks* are supported (see the m
       attributes[:type] ||= 'submit'
     end
     label ||= t("hobo.actions.remove", :default=>"Remove")
-    confirm = t("hobo.messages.confirm", :default=>"Are you sure?") if confirm.nil?
-    ajax_attrs[:confirm] = confirm if confirm
+    ajax_attrs[:confirm] = confirm ? confirm : t("hobo.messages.confirm_delete", :name => this.to_s, :default=>"Are you sure that you want to delete #{this.to_s}?")
 
     add_classes!(attributes,
                  image ? "image-button" : "button",

data/taglibs/html/a.dryml

@@ -137,6 +137,8 @@ The standard AJAX attributes are supported.
       href = object_url(target, "new", params)
 
       if href && (force || can_create?(new_record))
+        # Remove the object from memory after checking permissions
+        target.delete(new_record) if new_record && target.respond_to?(:build)
         new_class_name = if target.respond_to?(:proxy_association)
                            target.proxy_association.reflection.klass.name
                          else

data/taglibs/inputs/check_many.dryml

@@ -9,10 +9,8 @@
 <def tag="check-many" attrs="options, disabled"><%
   collection = this
   param_name = param_name_for_this
-  options ||= begin
-    conditions = ActiveRecord::Associations::BelongsToAssociation.new(this_parent, this_field_reflection).send(:conditions)
-    this_field_reflection.klass.all(:conditions => conditions, :limit => 100).select {|x| can_view?(x)}
-  end
+  options ||= \
+    this_field_reflection.klass.all.merge(this_field_reflection.scope).limit(100).select {|x| can_view?(x)}
   -%>
   <ul class="check-many" param="default" merge-attrs>
     <input type="hidden" name="#{param_name}[]" value=""/><% # ensure all items are removed when nothing checked

data/taglibs/inputs/select_many.dryml

@@ -17,9 +17,10 @@ To use this tag, the model of the items the user is chosing *must* have unique n
 `name`: the parameter name.  Defaults to `param_name_for_this`.
 
 %>
-<def tag="select-many" attrs="options, remove-label, prompt, disabled, name"><%
+<def tag="select-many" polymorphic attrs="options, remove-label, prompt, disabled, name"><%
   prompt ||= ht("#{this_field_reflection.klass.to_s.underscore}.form.select_many.prompt", :default=>"Add #{this_field.titleize.singularize}")
-  options ||= this_field_reflection.klass.where(this_field_reflection.options[:conditions]).select {|x| can_view?(x)}
+  options ||= \
+    this_field_reflection.klass.all.merge(this_field_reflection.scope).select {|x| can_view?(x)}
   name ||= param_name_for_this
 
   values = this

data/taglibs/inputs/select_one.dryml

@@ -6,7 +6,7 @@ This is the default input that Rapid uses for `belongs_to` associations. The men
 
  - `include-none` - whether to include a 'none' option (i.e. set the foreign key to null).   If this value is not supplied, the default is "true" if the current value is nil; otherwise the default is "false".  One implication of this is that the default may change when the form is re-rendered due to a validation failure.  Setting this value explicitly is recommended.
  - `blank-message` - the message for the 'none' option. Defaults to "(No `<model-name-human>`)", e.g. "(No Product)"
- - `options` - an array of records to include in the menu. Defaults to the all the records in the target table that match any `:conditions` declared on the `belongs_to` (subject to `limit`)
+ - `options` - an array of records to include in the menu. Defaults to the all the records in the target table that match any scope declared on the `has_many` (subject to `limit`)
  - `sort` - whether to sort the array of options. Defaults to no sorting.
  - `limit` - if `options` is not specified, this limits the number of records.  Default: 100
  - `text_method` - The method to call on each record to get the text for the option.  Multiple methods are supported ie "institution.name"
@@ -16,16 +16,13 @@ This is the default input that Rapid uses for `belongs_to` associations. The men
 For situations where there are too many target records to practically include in a menu, `<name-one>` provides an autocompleter which would be more suitable.
 
   -->
-<def tag="select-one" attrs="include-none, blank-message, options, sort, limit, text-method"><%
+<def tag="select-one" polymorphic attrs="include-none, blank-message, options, sort, limit, text-method"><%
   raise Hobo::PermissionDeniedError.new("Not allowed to edit #{this_field}") if !attributes[:disabled] && !can_edit?
   blank_message ||= ht("#{this_type.name.underscore}.messages.none", :default=>"No #{this_type.model_name.human} available.")
   limit ||= 100
 
-  options ||= begin
-    conditions = ActiveRecord::Associations::BelongsToAssociation.new(this_parent, this_field_reflection).options[:conditions]
-    order = this_field_reflection.klass.default_order
-    this_field_reflection.klass.where(conditions).limit(limit).order(order).select {|x| can_view?(x)}
-  end
+  options ||= \
+    this_field_reflection.klass.all.merge(this_field_reflection.scope).limit(limit).select {|x| can_view?(x)}
 
   id_method = this_field_reflection.options[:primary_key] || this_field_reflection.klass.primary_key
   if text_method.nil?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hobo_rapid
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Tom Locke, Bryan Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2015-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hobo
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.2
 description: The RAPID tag library for Hobo
 email: tom@tomlocke.com
 executables: []