katalyst-navigation 2.1.0 → 2.1.1
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 +4 -4
- data/app/components/katalyst/navigation/editor/base_component.rb +0 -2
- data/app/controllers/katalyst/navigation/items_controller.rb +3 -3
- data/app/controllers/katalyst/navigation/menus_controller.rb +6 -6
- data/app/helpers/katalyst/navigation/frontend/builder.rb +1 -2
- data/app/models/concerns/katalyst/navigation/has_tree.rb +2 -2
- data/db/migrate/20230727025052_update_target_syntax.rb +1 -2
- data/lib/katalyst/navigation/config.rb +2 -2
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b451858fe654754368852fb3306059ec0fc8f4190b254965df314a69d1cc3ae8
|
|
4
|
+
data.tar.gz: 47d872b6054b1f03654eca8a570d933ba36554ebd8cb77e544cf489676d96dc4
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 6a48ff41c1138f03f20726fe16c9e4ec024c9760e528f693d155ef3c790248eac38e428d4aa4c020157d20e13bcfea1065a4cbeef4877c34c0dcbe71e4fc3f1b
|
|
7
|
+
data.tar.gz: fc63b2a8a33dbea763d7eaf9890c88611e1ac58fea5ea9ad747097a91c9d791062157dbd55c1813ce3461ae5c7f0346cea71aeafa94f3b785f318d56b9654b47
|
|
@@ -63,12 +63,12 @@ module Katalyst
|
|
|
63
63
|
end
|
|
64
64
|
|
|
65
65
|
def set_menu
|
|
66
|
-
@menu = Menu.find(params
|
|
66
|
+
@menu = Menu.find(params.expect(:menu_id))
|
|
67
67
|
end
|
|
68
68
|
|
|
69
69
|
def set_item
|
|
70
|
-
@item
|
|
71
|
-
@menu
|
|
70
|
+
@item = Item.find(params.expect(:id))
|
|
71
|
+
@menu = @item.menu
|
|
72
72
|
@editor = Katalyst::Navigation::EditorComponent.new(menu:, item:)
|
|
73
73
|
end
|
|
74
74
|
|
|
@@ -12,7 +12,7 @@ module Katalyst
|
|
|
12
12
|
end
|
|
13
13
|
|
|
14
14
|
def show
|
|
15
|
-
menu = Menu.find(params
|
|
15
|
+
menu = Menu.find(params.expect(:id))
|
|
16
16
|
editor = Katalyst::Navigation::EditorComponent.new(menu:)
|
|
17
17
|
|
|
18
18
|
render locals: { menu:, editor: }
|
|
@@ -26,7 +26,7 @@ module Katalyst
|
|
|
26
26
|
end
|
|
27
27
|
|
|
28
28
|
def edit
|
|
29
|
-
menu = Menu.find(params
|
|
29
|
+
menu = Menu.find(params.expect(:id))
|
|
30
30
|
editor = Katalyst::Navigation::EditorComponent.new(menu:)
|
|
31
31
|
|
|
32
32
|
render locals: { menu:, editor: }
|
|
@@ -41,20 +41,20 @@ module Katalyst
|
|
|
41
41
|
@menu.save!
|
|
42
42
|
redirect_to @menu, status: :see_other
|
|
43
43
|
else
|
|
44
|
-
render :new, locals: { menu: @menu, editor: }, status: :
|
|
44
|
+
render :new, locals: { menu: @menu, editor: }, status: :unprocessable_content
|
|
45
45
|
end
|
|
46
46
|
end
|
|
47
47
|
|
|
48
48
|
# PATCH /admins/navigation_menus/:slug
|
|
49
49
|
def update
|
|
50
|
-
menu = Menu.find(params
|
|
50
|
+
menu = Menu.find(params.expect(:id))
|
|
51
51
|
editor = Katalyst::Navigation::EditorComponent.new(menu:)
|
|
52
52
|
|
|
53
53
|
menu.attributes = menu_params
|
|
54
54
|
|
|
55
55
|
unless menu.valid?
|
|
56
56
|
return respond_to do |format|
|
|
57
|
-
format.turbo_stream { render editor.errors, status: :
|
|
57
|
+
format.turbo_stream { render editor.errors, status: :unprocessable_content }
|
|
58
58
|
end
|
|
59
59
|
end
|
|
60
60
|
|
|
@@ -71,7 +71,7 @@ module Katalyst
|
|
|
71
71
|
end
|
|
72
72
|
|
|
73
73
|
def destroy
|
|
74
|
-
menu = Menu.find(params
|
|
74
|
+
menu = Menu.find(params.expect(:id))
|
|
75
75
|
|
|
76
76
|
menu.destroy!
|
|
77
77
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
-
# rubocop:disable Rails/HelperInstanceVariable
|
|
3
|
+
# rubocop:disable-next Rails/HelperInstanceVariable
|
|
4
4
|
module Katalyst
|
|
5
5
|
module Navigation
|
|
6
6
|
module Frontend
|
|
@@ -70,4 +70,3 @@ module Katalyst
|
|
|
70
70
|
end
|
|
71
71
|
end
|
|
72
72
|
end
|
|
73
|
-
# rubocop:enable Rails/HelperInstanceVariable
|
|
@@ -38,7 +38,7 @@ module Katalyst
|
|
|
38
38
|
|
|
39
39
|
# Add node to the top of builder stacks
|
|
40
40
|
def push(node)
|
|
41
|
-
self.depth
|
|
41
|
+
self.depth += 1
|
|
42
42
|
self.current = node
|
|
43
43
|
self.children = node.children = []
|
|
44
44
|
node
|
|
@@ -46,7 +46,7 @@ module Katalyst
|
|
|
46
46
|
|
|
47
47
|
# Remove current from builder stack
|
|
48
48
|
def pop
|
|
49
|
-
previous
|
|
49
|
+
previous = current
|
|
50
50
|
self.depth -= 1
|
|
51
51
|
if depth.zero?
|
|
52
52
|
self.current = nil
|
|
@@ -2,12 +2,11 @@
|
|
|
2
2
|
|
|
3
3
|
# Ensures that all navigation items have a valid target and http_method.
|
|
4
4
|
class UpdateTargetSyntax < ActiveRecord::Migration[7.0]
|
|
5
|
-
# rubocop:disable Rails/SkipsModelValidations
|
|
5
|
+
# rubocop:disable-next Rails/SkipsModelValidations
|
|
6
6
|
def change
|
|
7
7
|
Katalyst::Navigation::Item.where(http_method: nil).update_all(http_method: "get")
|
|
8
8
|
Katalyst::Navigation::Item.where(target: nil).update_all(target: "self")
|
|
9
9
|
Katalyst::Navigation::Item.where(target: "_blank").update_all(target: "blank")
|
|
10
10
|
Katalyst::Navigation::Item.where(target: "_top").update_all(target: "top")
|
|
11
11
|
end
|
|
12
|
-
# rubocop:enable Rails/SkipsModelValidations
|
|
13
12
|
end
|
|
@@ -8,9 +8,9 @@ module Katalyst
|
|
|
8
8
|
:items
|
|
9
9
|
|
|
10
10
|
def initialize
|
|
11
|
-
self.base_controller
|
|
11
|
+
self.base_controller = "ApplicationController"
|
|
12
12
|
self.errors_component = "Katalyst::Navigation::Editor::ErrorsComponent"
|
|
13
|
-
self.items
|
|
13
|
+
self.items = %w[
|
|
14
14
|
Katalyst::Navigation::Heading
|
|
15
15
|
Katalyst::Navigation::Link
|
|
16
16
|
Katalyst::Navigation::Button
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: katalyst-navigation
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.1.
|
|
4
|
+
version: 2.1.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Katalyst Interactive
|
|
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
165
165
|
- !ruby/object:Gem::Version
|
|
166
166
|
version: '0'
|
|
167
167
|
requirements: []
|
|
168
|
-
rubygems_version:
|
|
168
|
+
rubygems_version: 4.0.20
|
|
169
169
|
specification_version: 4
|
|
170
170
|
summary: Navigation generator and editor
|
|
171
171
|
test_files: []
|