spree_backend 3.4.0.rc1 → 3.4.0.rc2

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.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/spree/admin/taxons_controller.rb +4 -2
  3. data/app/views/spree/admin/taxons/_form.html.erb +1 -0
  4. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 36eab3a9676906861059532cd8d26dbdb623d3f7
4
- data.tar.gz: ef850027dc86fad30a13802b2c5061e3a021b632
3
+ metadata.gz: 13476b0803c0b059ed0c8e883fe0cd1bbc0ab040
4
+ data.tar.gz: f8cd3c3763637912f4712b5ae258ded588f9754e
5
5
  SHA512:
6
- metadata.gz: f438859a49d14c1dfa65d67c74763510d67e6ed03179b8944f0253fc8246040dfb7a96c27dc4edfe512bb225b12249fc2cae1063135a2b6c7717f2ce7e6f45d0
7
- data.tar.gz: e73b0c399415e40b089eae1373f5a4c8b9a7d830c9c00c2c044f0642c027d320109a89ec0458d8eff1c0fcbf35693f46846078a6e99f83f7d389ab13c8b0b2f4
6
+ metadata.gz: 3a83fcd5ff18797d8cfbf6b80f0de545f81ed491609233e152c9ddc2bede6abae2b3e9265d3277052e2fb01309a238efb574638ed4e9f1bd43f7015ba4d291c0
7
+ data.tar.gz: 1e67b1b168485c3b684c010608fa6c4f54f5f2f9268f42a769c5bee57d74ccd0ddaf7229096c4919239b375763bdfe4bbca9c5c2a7d71de009e4cbbb24aae54c
data/app/controllers/spree/admin/taxons_controller.rb CHANGED
@@ -9,7 +9,8 @@ module Spree
9
9
  def index; end
10
10
 
11
11
  def create
12
- @taxon = @taxonomy.taxons.build(params[:taxon])
12
+ @taxon = @taxonomy.taxons.build(params[:taxon].except(:icon))
13
+ @taxon.build_icon(attachment: taxon_params[:icon])
13
14
  if @taxon.save
14
15
  respond_with(@taxon) do |format|
15
16
  format.json { render json: @taxon.to_json }
@@ -40,7 +41,8 @@ module Spree
40
41
  # check if we need to rename child taxons if parent name or permalink changes
41
42
  @update_children = true if params[:taxon][:name] != @taxon.name || params[:taxon][:permalink] != @taxon.permalink
42
43
 
43
- @taxon.update_attributes(taxon_params)
44
+ @taxon.create_icon(attachment: taxon_params[:icon]) if taxon_params[:icon]
45
+ @taxon.update_attributes(taxon_params.except(:icon))
44
46
  end
45
47
  if successful
46
48
  flash[:success] = flash_message_for(@taxon, :successfully_updated)
data/app/views/spree/admin/taxons/_form.html.erb CHANGED
@@ -17,6 +17,7 @@
17
17
 
18
18
  <%= f.field_container :icon, class: ['form-group'] do %>
19
19
  <%= f.label :icon, Spree.t(:icon) %>
20
+ <%= image_tag @taxon.icon.try(:attachment).to_s %>
20
21
  <%= f.file_field :icon %>
21
22
  <% end %>
22
23
  </div>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_backend
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.4.0.rc1
4
+ version: 3.4.0.rc2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-09-22 00:00:00.000000000 Z
11
+ date: 2017-10-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: spree_api
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 3.4.0.rc1
19
+ version: 3.4.0.rc2
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 3.4.0.rc1
26
+ version: 3.4.0.rc2
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: spree_core
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 3.4.0.rc1
33
+ version: 3.4.0.rc2
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 3.4.0.rc1
40
+ version: 3.4.0.rc2
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bootstrap-sass
43
43
  requirement: !ruby/object:Gem::Requirement