Skip to content

Commit 2e6dc44

Browse files
committed
Merge branch 'implementing_issue_59' of github.com:basemate/basemate-ui-core into implementing_issue_59
2 parents 5e9fa14 + ee7a62b commit 2e6dc44

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

app/concepts/matestack/ui/core/collection/content/content.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ def setup
66
@component_config = @component_config.except(:data, :paginated_data)
77
end
88

9-
109
def response
1110
components {
1211
div do
@@ -15,6 +14,5 @@ def response
1514
}
1615
end
1716

18-
1917
end
2018
end

docs/components/collection.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
Show [specs](../../spec/usage/components/collection_spec.rb)
44

5-
The `collection` component is designed:
5+
The `collection` component is designed to
66

7-
- to display instances from a model (Active Record or similar)
7+
- display instances from a model (Active Record or similar)
88
- filter the displayed instances without full page reload
99
- paginate the displayed instances without full page reload
1010
- order the displayed instances without full page reload
@@ -258,8 +258,8 @@ class Pages::MyApp::Collection < Matestack::Ui::Page
258258
plain "sort by:"
259259
collection_order_toggle key: :title do
260260
button do
261-
# we want to use an "arrow up (unicode: &#8593;)"
262-
# and and an "arrow down (unicode: &#8595;)" in order to
261+
# we use an "arrow up (unicode: &#8593;)"
262+
# and and an "arrow down (unicode: &#8595;)" to
263263
# visualize the current order state
264264
collection_order_toggle_indicator key: :title, asc: '&#8593;', desc: '&#8595;'
265265
plain "title"
@@ -317,7 +317,7 @@ end
317317

318318
### Action enriched collection
319319

320-
In this example, we want to display ALL instances of `DummyModel` and filter the collection by title using a text input. Additionally we want to delete an item of the list using the `action` component.
320+
In this example, we want to display ALL instances of `DummyModel` and filter the collection by title using a text input. Additionally we want to be able to delete an item of the list using the `action` component.
321321

322322
```ruby
323323
class Pages::MyApp::Collection < Matestack::Ui::Page

spec/dummy/app/controllers/my_app_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def delete_dummy_model
5555
else
5656
render json: {
5757
errors: @dummy_model.errors,
58-
message: "Test Model could not be saved!"
58+
message: "Test Model could not be deleted!"
5959
}, status: :unproccessable_entity
6060
end
6161

0 commit comments

Comments
 (0)