nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-28 11:00:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/bulk-operations' into bulk-operations

Browse Source 
# Conflicts:
#	public/mix-manifest.json
#	resources/js/components/FilesView/ContextMenu.vue
This commit is contained in:
Peter Papp
2020-12-13 17:52:24 +01:00
parent 11873d06ff 89ea50b893
commit bda293bc53
23 changed files with 155 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/js/store/modules/fileBrowser.js
Vendored
+3 -3
View File
@@ -36,11 +36,11 @@ const actions = {
commit('STORE_PREVIOUS_FOLDER', getters.currentFolder)
let url = payload.folder.location === 'trash'
? '/folders/' + payload.folder.unique_id + '?trash=true'
: '/folders/' + payload.folder.unique_id
? '/folders/' + payload.folder.unique_id + getters.sorting.URI + '&trash=true'
: '/folders/' + payload.folder.unique_id + getters.sorting.URI
axios
.get(getters.api + url + getters.sorting.URI)
.get(getters.api + url)
.then(response => {
commit('LOADING_STATE', {loading: false, data: response.data})
commit('STORE_CURRENT_FOLDER', payload.folder)