-
-
Notifications
You must be signed in to change notification settings - Fork 3.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Delete button on asset view page #12940
Conversation
…o delete_asset_from_view_page # Conflicts: # resources/views/hardware/view.blade.php
PR Summary
|
There is a placeholder comment on the hardware/view blade for a generic image if no image is provided by the user |
routes/web/hardware.php
Outdated
@@ -146,9 +146,9 @@ function () { | |||
[AssetFilesController::class, 'show'] | |||
)->name('show/assetfile'); | |||
|
|||
Route::delete('{assetId}/showfile/{fileId}/delete', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will break file deletion on assets. We already have a delete route - the one we use for table-button deletes. No route changes should be required here, unless I'm missing something (and I might be)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can double check we still use this. With the rewrite it probably isn't used. but I can look at it this weekend.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We don't work on weekends :) It will keep until monday :D
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
that was old, and couldn't get it to work. but it should be gone off the final bit
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm still showing this route as deleted in the diff?
we can chat Monday. i think the merge i did messed some stuff up. I also just need to commit less i guess. |
resources/lang/en/general.php
Outdated
@@ -91,7 +91,6 @@ | |||
'debug_warning' => 'Warning!', | |||
'debug_warning_text' => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the <code>APP_DEBUG</code> value in your <code>.env</code> file to <code>false</code>.', | |||
'delete' => 'Delete', | |||
'delete_confirm' => 'Are you sure you wish to delete :item?', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is this deleted?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, I thought I added this back in??
I originally thought we didn't need it cause you said we had a string already, but this was probably the strong you were talking about.
routes/web/hardware.php
Outdated
)->name('delete/assetfile'); | ||
Route::delete('{assetId}/delete', | ||
[AssetsController::class, 'destroy'] | ||
)->name('hardware/delete'); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This route already exists - we shouldn't have to add or remove anything from routes for this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, it was removed on my side and I had added it back. Sorry got crossed up.
Description
A button has been added to the Asset detail view page that allows for deletion (archiving) of that asset.
Additionally, the dropdown menu in the upper right has been removed and replaced with buttons on the right column.
Fixes # (issue)
Type of change
Please delete options that are not relevant.
How Has This Been Tested?
Tested Locally.
Checklist: