mirror of
https://github.com/snipe/snipe-it.git
synced 2025-01-03 18:07:41 -08:00
Merge remote-tracking branch 'origin/develop'
This commit is contained in:
commit
96a4391d5c
|
@ -1365,7 +1365,7 @@
|
|||
<x-filestable
|
||||
filepath="private_uploads/assets/"
|
||||
showfile_routename="show/assetfile"
|
||||
deletefile_routename="delete/modelfile"
|
||||
deletefile_routename="delete/assetfile"
|
||||
:object="$asset" />
|
||||
</div> <!-- /.col-md-12 -->
|
||||
</div> <!-- /.row -->
|
||||
|
@ -1379,7 +1379,7 @@
|
|||
<x-filestable
|
||||
filepath="private_uploads/assetmodels/"
|
||||
showfile_routename="show/modelfile"
|
||||
deletefile_routename="userfile.destroy"
|
||||
deletefile_routename="delete/modelfile"
|
||||
:object="$asset->model" />
|
||||
|
||||
</div> <!-- /.col-md-12 -->
|
||||
|
|
Loading…
Reference in a new issue