Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
Géocontrib Frontend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Redmine
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GéoContrib
Géocontrib Frontend
Commits
1ede60d0
Commit
1ede60d0
authored
3 years ago
by
Sébastien DA ROCHA
Browse files
Options
Downloads
Plain Diff
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
!295
Version 3.0.0
,
!291
REDMINE_ISSUE-13010
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/Projects/SearchProjects.vue
+3
-0
3 additions, 0 deletions
src/components/Projects/SearchProjects.vue
src/store/modules/projects.store.js
+14
-18
14 additions, 18 deletions
src/store/modules/projects.store.js
with
17 additions
and
18 deletions
src/components/Projects/SearchProjects.vue
+
3
−
0
View file @
1ede60d0
...
@@ -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
)
},
},
...
...
This diff is collapsed.
Click to expand it.
src/store/modules/projects.store.js
+
14
−
18
View file @
1ede60d0
...
@@ -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
);
}
}
},
},
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment