cmor_legal_frontend 0.0.58.pre → 0.0.59.pre

Sign up to get free protection for your applications and to get access to all the features.
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: 641282f729b10c10de9851d144ade633e01949b1b2b11b37a9f78d1d1628427c
4
- data.tar.gz: aad2e12d9f70c514105636f51359bc8f2733c9e9c5f9737de65c3710d8baec30
3
+ metadata.gz: a61335cd6df44af2a8b4f33dbea0115361490866d50393a288cf149e719fac2e
4
+ data.tar.gz: eda49c33f979c442e4030b7ca73fef69ee8adb521b8c21d6bed4327e34ed80d8
5
5
  SHA512:
6
- metadata.gz: b187862f451a06562df02568b4f18f0b6a3f81c5ab4811ec72d100274010d43ffebd34b2fc3255b204d74b25e4e5016cc10a0b90af8db03064378768071cb0fa
7
- data.tar.gz: 2a166342b06fde062956a84f561aa54013db4ca6a91564f167445cf6a49ccd2a30aefce5cdbbc62b1307fdaab7d10832bbb07ec4b15cc91bc30da8d7e7747ea5
6
+ metadata.gz: 1e75f544f589baeca9e3e2cac79fdef4adbec61f1f592f2bec051ff00aef99e8f9ea33c1ff8874c82be8b104c9e9f787057ed4073d98992343103547c0dab2eb
7
+ data.tar.gz: 6d1b5db7e44f1d61d8bb68910778aaf80bc2cdbd3ba5dc0b72fe96c0965677c7166ce544f8dbcb1c471c89d1ab20930365d8ff8b9f141ab34fab1b1a7fc49a29
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.58.pre
4
+ version: 0.0.59.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-07-17 00:00:00.000000000 Z
11
+ date: 2020-08-18 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.58.pre
33
+ version: 0.0.59.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.58.pre
40
+ version: 0.0.59.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.58.pre
47
+ version: 0.0.59.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.58.pre
54
+ version: 0.0.59.pre
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: sqlite3
57
57
  requirement: !ruby/object:Gem::Requirement