cmor_legal_frontend 0.0.55.pre → 0.0.60.pre

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 (5) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/cmor_legal_frontend.css +1 -1
  3. data/app/controllers/cmor/legal/frontend/cookie_preferences_controller.rb +17 -10
  4. data/config/locales/en.yml +5 -1
  5. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e7ca4af009944dd36bbc5d115078dc8740744ba1d4087ca9f19042087b47c748
4
- data.tar.gz: f9faed97584eabb25079367506cd22cfc327cf33dc3060fc152656cdadce8beb
3
+ metadata.gz: 7c5914935f74f18c507c90e7e3c4005707901a947bbf62b14fe117250a4f3700
4
+ data.tar.gz: f63a3e572d4096b6796af4ef629b0802193ec988a187c077cccde2b112b14b70
5
5
  SHA512:
6
- metadata.gz: e14eb249e97e5009a46a048dd7f8dc5960b109b54d2b75e8c7df848b6f18cfdd4e6ed674045046549d04386441744d9888afbfce4fe1b8cbe512805a41f51bd4
7
- data.tar.gz: daf2d5ca47beb90399922921e8bed5b509f14af01a869856d24ba3b0a9cc9ba77462f0b262c31c20284d6073d4a2d9eff96c7d623ce71c902d5e0f5fe078790e
6
+ metadata.gz: f33c1a36eabedf2f749a32bd3a001451c338ed27e167b8ac5784ef22f8d8cc0f8a1bcf87724ff88065b5f84fae73f4314e226dd6fa3013b71915d1ca1c5d1c32
7
+ data.tar.gz: 463447c6e38bdcafb22ed9c53444781d668c80d9b47f9f6a804fe30a634839f88651dc3172043a144de2183ab44b351bde6513a523d4ea3c1ab3ab0ca30ef3fa
data/app/assets/stylesheets/cmor_legal_frontend.css CHANGED
@@ -1,3 +1,3 @@
1
1
  /*
2
- *= require ./cmor/legal/frontend/application
2
+ *= require cmor/legal/frontend/application
3
3
  */
data/app/controllers/cmor/legal/frontend/cookie_preferences_controller.rb CHANGED
@@ -4,6 +4,8 @@ module Cmor
4
4
  module Legal
5
5
  module Frontend
6
6
  class CookiePreferencesController < Cmor::Legal::Frontend::Configuration.base_controller.constantize
7
+ include Rao::ResourcesController::LocationHistoryConcern
8
+
7
9
  if respond_to?(:before_action)
8
10
  before_action :initialize_resource, only: [:edit, :update]
9
11
  else
@@ -16,7 +18,7 @@ module Cmor
16
18
  def update
17
19
  respond_to do |format|
18
20
  if @resource.update_attributes(permitted_params)
19
- format.html { redirect_to((request.referer || url_for(action: "edit")), notice: t(".success")) }
21
+ format.html { redirect_to(after_update_location, notice: t(".success")) }
20
22
  else
21
23
  format.html { render :edit }
22
24
  end
@@ -24,17 +26,22 @@ module Cmor
24
26
  end
25
27
 
26
28
  private
27
- def permitted_params
28
- if params.is_a?(ActiveSupport::HashWithIndifferentAccess)
29
- params[:cookie_preferences]
30
- else
31
- params.fetch(:cookie_preferences, {}).permit(@resource.cookies.map(&:identifier))
32
- end
33
- end
34
29
 
35
- def initialize_resource
36
- @resource = ::Cmor::Legal::CookiePreferences.new(cookie_store: ::Cmor::Legal::CookieStore.new(send(::Cmor::Legal::Configuration.cookie_storage)))
30
+ def after_update_location
31
+ last_location || main_app.root_path
32
+ end
33
+
34
+ def permitted_params
35
+ if params.is_a?(ActiveSupport::HashWithIndifferentAccess)
36
+ params[:cookie_preferences]
37
+ else
38
+ params.fetch(:cookie_preferences, {}).permit(@resource.cookies.map(&:identifier))
37
39
  end
40
+ end
41
+
42
+ def initialize_resource
43
+ @resource = ::Cmor::Legal::CookiePreferences.new(cookie_store: ::Cmor::Legal::CookieStore.new(send(::Cmor::Legal::Configuration.cookie_storage)))
44
+ end
38
45
  end
39
46
  end
40
47
  end
data/config/locales/en.yml CHANGED
@@ -32,7 +32,11 @@ en:
32
32
  frontend:
33
33
  cookie_preferences:
34
34
  allowed_cookies:
35
- more: Mehr
35
+ more: Mehr
36
+ form:
37
+ accept_all: "Accept all"
38
+ apply: "Apply settings"
39
+ customize: "Customize settings"
36
40
  update:
37
41
  success: 'Settings successfully saved.'
38
42
  cookies:
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cmor_legal_frontend
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.55.pre
4
+ version: 0.0.60.pre
5
5
  platform: ruby
6
6
  authors:
7
7
  - Roberto Vasquez Angel
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-06-28 00:00:00.000000000 Z
11
+ date: 2020-10-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -30,28 +30,28 @@ dependencies:
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 0.0.55.pre
33
+ version: 0.0.60.pre
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: 0.0.55.pre
40
+ version: 0.0.60.pre
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: cmor_core_frontend
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - '='
46
46
  - !ruby/object:Gem::Version
47
- version: 0.0.55.pre
47
+ version: 0.0.60.pre
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - '='
53
53
  - !ruby/object:Gem::Version
54
- version: 0.0.55.pre
54
+ version: 0.0.60.pre
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: sqlite3
57
57
  requirement: !ruby/object:Gem::Requirement