Merge remote-tracking branch 'origin/develop'

This commit is contained in:
snipe 2024-11-14 19:05:08 +00:00
commit 96a4391d5c

View file

@ -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 -->