Feature/instrument type and instrument #74
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
agwozdowski
commented
Sep 28, 2019
•
agwozdowski
commented
- Added InstrumentType to "Laws" menu. Implemented also soft-delete for it.
- Instrument model, migration, resource, form, soft-delete
- Added instruments to Legislation model and views
agwozdowski
changed the title
kowal
approved these changes
Sep 30, 2019
| @@ -41,4 +41,15 @@ def document_links | |||
| title: document.external? ? document.url : nil | |||
| end | |||
| end | |||
|
|
|||
| def instrument_links | |||
| return [] if model.instruments.empty? | |||
There was a problem hiding this comment.
I think you want to check model.instruments.nil? here or remove this check completely because instruments.map will handle empty array.
There was a problem hiding this comment.
Removed this if. Take a look please
tsubik
reviewed
Sep 30, 2019
| describe 'DELETE destroy' do | ||
| let!(:instrument) { create(:instrument, discarded_at: nil) } | ||
|
|
||
| context 'with valid pspec/factories/instrument_types.rb:16arams' do |
There was a problem hiding this comment.
some accidental ctrl-v here
There was a problem hiding this comment.
:D thanks @tsubik !
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.