lalala 4.1.0.dev.305 → 4.1.0.dev.309
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5d854c908da3c69b8ab328a4e4e059a8d5a42422
|
4
|
+
data.tar.gz: 9988d780177b088e0cfc30c5ac4f7e74cc22f29c
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 05ad5cb9f8daf46eafaa41e938f8c6ea0d6799c95a7e6db007e19852bd719139d5b07c3b3b7e4c44409779006a96079ff2a3c7bcc07d01b7b3e95c9fea6556b2
|
7
|
+
data.tar.gz: 807490aba98de0452f6bf9f5215c675279b819c81f142fad5f8516495e498d1616ae0c0c6ee890144cb0e46f0454397c51ed6e5a435b8ba0a7c9f1b000f4afd2
|
@@ -9,11 +9,10 @@ class Formtastic::Inputs::MultipleFilesInput
|
|
9
9
|
title = method.to_s.pluralize.titleize
|
10
10
|
assets = object.send(method)
|
11
11
|
|
12
|
-
|
13
|
-
|
14
|
-
accepts = profile.try(:accepted_file_types)
|
12
|
+
defn = object.class.haraway_assets[method.to_s]
|
13
|
+
accepts = defn.profile.try(:accepted_file_types)
|
15
14
|
accepts = accepts.join(", ") if accepts
|
16
|
-
versions = compile_versions_array(profile)
|
15
|
+
versions = compile_versions_array(defn.profile)
|
17
16
|
|
18
17
|
sorted_assets = klass.sorted_assets(assets.clone).map do |asset|
|
19
18
|
klass.xfile_html(self, template, param_key, asset, versions)
|
@@ -21,7 +20,7 @@ class Formtastic::Inputs::MultipleFilesInput
|
|
21
20
|
|
22
21
|
<<-HTML
|
23
22
|
|
24
|
-
<x-files multiple-files profile="#{
|
23
|
+
<x-files multiple-files profile="#{defn.profile.name}" accept="#{accepts}" name="#{param_key}">
|
25
24
|
<header>
|
26
25
|
<div class="col-a">
|
27
26
|
<span class="name">#{title}</span>
|
@@ -54,7 +53,7 @@ class Formtastic::Inputs::MultipleFilesInput
|
|
54
53
|
</div>
|
55
54
|
|
56
55
|
<div class="meta-versions">
|
57
|
-
#{ versions_html(profile) }
|
56
|
+
#{ versions_html(defn.profile) }
|
58
57
|
</div>
|
59
58
|
</x-files>
|
60
59
|
|
@@ -7,15 +7,14 @@ class Formtastic::Inputs::SingleFileInput
|
|
7
7
|
title = method.to_s.titleize
|
8
8
|
asset = object.send(method)
|
9
9
|
|
10
|
-
|
11
|
-
|
12
|
-
accepts = profile.try(:accepted_file_types)
|
10
|
+
defn = object.class.haraway_assets[method.to_s]
|
11
|
+
accepts = defn.profile.try(:accepted_file_types)
|
13
12
|
accepts = accepts.join(", ") if accepts
|
14
|
-
versions = compile_versions_array(profile)
|
13
|
+
versions = compile_versions_array(defn.profile)
|
15
14
|
|
16
15
|
<<-HTML
|
17
16
|
|
18
|
-
<x-files single-file profile="#{
|
17
|
+
<x-files single-file profile="#{defn.profile.name}" accept="#{accepts}" name="#{param_key}">
|
19
18
|
<div class="association">#{ title }</div>
|
20
19
|
|
21
20
|
<div class="buttons">
|
data/lib/lalala/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: lalala
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 4.1.0.dev.
|
4
|
+
version: 4.1.0.dev.309
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Simon Menke
|
@@ -13,7 +13,7 @@ authors:
|
|
13
13
|
autorequire:
|
14
14
|
bindir: bin
|
15
15
|
cert_chain: []
|
16
|
-
date: 2014-03-
|
16
|
+
date: 2014-03-04 00:00:00.000000000 Z
|
17
17
|
dependencies:
|
18
18
|
- !ruby/object:Gem::Dependency
|
19
19
|
name: activeadmin
|