fix(inventory): allow deletion from inventory #4149
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
|
bors r+ |
|
This PR was included in a batch with a merge conflict, it will be automatically retried |
2 similar comments
|
This PR was included in a batch with a merge conflict, it will be automatically retried |
|
This PR was included in a batch with a merge conflict, it will be automatically retried |
|
Heads up @jniles, we just merged some commits that conflict with the changes your made in this pull request! You can review this repository's recent commits to see where the conflicts occur. Please rebase your feature branch against the |
This commit removes the foreign key constraints from the inventory_log to allow deletion from the inventory. It also fixes the http headers sent twice error in the error handler. Closes Third-Culture-Software#4147.
jniles
force-pushed
the
fix-inventory-delete-error-message
branch
from
839970a
to
789e1b6
Compare
Canceled |
|
bors r+ |
bors bot
added a commit
that referenced
this pull request
Feb 3, 2020
4143: feat(reports): add file type detection r=jniles a=jniles Adds file type detection to the reports archive page so that we are not proposing to the user to print reports that are not printable (xlsx for example). It also adds features to provide the correct font awesome icon depending on the extension to help a user determine which kind of file they will be downloading. **Example**  4149: fix(inventory): allow deletion from inventory r=jniles a=jniles This commit removes the foreign key constraints from the inventory_log to allow deletion from the inventory. It also fixes the http headers sent twice error in the error handler. Closes #4147. Co-authored-by: Jonathan Niles <jonathanwniles@gmail.com>
|
bors r- |
Canceled |
|
bors r+ |
bors bot
added a commit
that referenced
this pull request
Feb 3, 2020
4143: feat(reports): add file type detection r=jniles a=jniles Adds file type detection to the reports archive page so that we are not proposing to the user to print reports that are not printable (xlsx for example). It also adds features to provide the correct font awesome icon depending on the extension to help a user determine which kind of file they will be downloading. **Example**  4149: fix(inventory): allow deletion from inventory r=jniles a=jniles This commit removes the foreign key constraints from the inventory_log to allow deletion from the inventory. It also fixes the http headers sent twice error in the error handler. Closes #4147. Co-authored-by: Jonathan Niles <jonathanwniles@gmail.com>
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.
This commit removes the foreign key constraints from the inventory_log
to allow deletion from the inventory. It also fixes the http headers
sent twice error in the error handler.
Closes #4147.