Skip to content
Snippets Groups Projects
Commit 1ede60d0 authored by Sébastien DA ROCHA's avatar Sébastien DA ROCHA :bicyclist:
Browse files

Merge branch 'redmine-issues/13010' into 'develop'

REDMINE_ISSUE-13010

See merge request !291
parents a6f1995b bcd7b6bb
No related branches found
No related tags found
2 merge requests!295Version 3.0.0,!291REDMINE_ISSUE-13010
...@@ -35,6 +35,9 @@ export default { ...@@ -35,6 +35,9 @@ export default {
this.searchFunction(newValue) this.searchFunction(newValue)
.then(() => { .then(() => {
this.$emit('loading', false); this.$emit('loading', false);
})
.catch((err) => {
if (err.message) this.$emit('loading', false);
}); });
}, 100) }, 100)
}, },
......
...@@ -153,25 +153,21 @@ const projects = { ...@@ -153,25 +153,21 @@ const projects = {
} }
} }
try { const response = await axios.get(
const response = await axios.get( filteredUrl ? filteredUrl : url,
filteredUrl ? filteredUrl : url, {
{ cancelToken: cancelToken.token,
cancelToken: cancelToken.token, }
} );
); if (response.status === 200) {
if (response.status === 200) { const projects = response.data;
const projects = response.data; if (projects) {
if (projects) { commit('SET_PROJECTS', projects);
commit('SET_PROJECTS', projects); commit('SET_PROJECTS_SEARCH_STATE', {
commit('SET_PROJECTS_SEARCH_STATE', { isSearched: true,
isSearched: true, text: text
text: text });
});
}
} }
} catch(err) {
console.error(err);
} }
}, },
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment