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
d8417ab8
Commit
d8417ab8
authored
3 years ago
by
Timothee P
Browse files
Options
Downloads
Patches
Plain Diff
fix query string myaccount wrong name and invalid query string
parent
f3a69857
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!424
version 3.1.0
,
!315
REDMINE_ISSUE-13183
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
package.json
+1
-1
1 addition, 1 deletion
package.json
src/services/project-api.js
+3
-3
3 additions, 3 deletions
src/services/project-api.js
src/store/modules/projects.store.js
+2
-2
2 additions, 2 deletions
src/store/modules/projects.store.js
src/views/My_account.vue
+1
-1
1 addition, 1 deletion
src/views/My_account.vue
with
7 additions
and
7 deletions
package.json
+
1
−
1
View file @
d8417ab8
...
...
@@ -4,7 +4,7 @@
"private"
:
true
,
"scripts"
:
{
"serve"
:
"npm run init-proxy & npm run init-serve"
,
"init-proxy"
:
"lcp --proxyUrl http://
localhost
:8000 --origin http://localhost:8080 --proxyPartial ''"
,
"init-proxy"
:
"lcp --proxyUrl http://
127.0.0.1
:8000 --origin http://localhost:8080 --proxyPartial ''"
,
"init-serve"
:
"vue-cli-service serve"
,
"build"
:
"vue-cli-service build"
,
"lint"
:
"vue-cli-service lint"
...
...
This diff is collapsed.
Click to expand it.
src/services/project-api.js
+
3
−
3
View file @
d8417ab8
...
...
@@ -45,12 +45,12 @@ const projectAPI = {
}
},
async
getProjects
({
baseUrl
,
filters
,
page
,
projectSlug
,
is
myaccount
})
{
async
getProjects
({
baseUrl
,
filters
,
page
,
projectSlug
,
myaccount
})
{
let
url
=
`
${
baseUrl
}
projects/`
;
if
(
projectSlug
)
url
+=
`
${
projectSlug
}
/`
;
url
+=
`?page=
${
page
}
`
;
if
(
is
myaccount
)
{
url
+=
'
&
is
myaccount
'
;
if
(
myaccount
)
{
url
+=
'
&myaccount
=true
'
;
}
try
{
if
(
Object
.
values
(
filters
).
some
(
el
=>
el
&&
el
.
length
>
0
))
{
...
...
This diff is collapsed.
Click to expand it.
src/store/modules/projects.store.js
+
2
−
2
View file @
d8417ab8
...
...
@@ -80,7 +80,7 @@ const projects = {
},
async
GET_PROJECTS
({
state
,
rootState
,
commit
},
payload
)
{
let
{
page
,
is
myaccount
,
projectSlug
}
=
payload
||
{};
let
{
page
,
myaccount
,
projectSlug
}
=
payload
||
{};
if
(
!
page
)
{
page
=
state
.
currentPage
;
}
...
...
@@ -90,7 +90,7 @@ const projects = {
filters
:
state
.
filters
,
page
,
projectSlug
,
is
myaccount
,
myaccount
,
});
commit
(
'
SET_PROJECTS
'
,
projects
);
return
;
...
...
This diff is collapsed.
Click to expand it.
src/views/My_account.vue
+
1
−
1
View file @
d8417ab8
...
...
@@ -420,7 +420,7 @@ export default {
getData
(
page
)
{
this
.
projectsLoading
=
true
;
this
.
GET_PROJECTS
({
is
myaccount
:
true
,
projectSlug
:
this
.
$route
.
params
.
slug
,
page
})
this
.
GET_PROJECTS
({
myaccount
:
true
,
projectSlug
:
this
.
$route
.
params
.
slug
,
page
})
.
then
(()
=>
this
.
projectsLoading
=
false
)
.
catch
(()
=>
this
.
projectsLoading
=
false
);
},
...
...
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