Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
dashboard
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository 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
AURA
dashboard
Commits
4d4d7f90
Commit
4d4d7f90
authored
6 years ago
by
jackie / Andrea Ida Malkah Klaura
Browse files
Options
Downloads
Patches
Plain Diff
FIX: api trailing slashes and new fundingcategories
parent
d4219005
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/components/ShowManager.vue
+17
-17
17 additions, 17 deletions
src/components/ShowManager.vue
with
17 additions
and
17 deletions
src/components/ShowManager.vue
+
17
−
17
View file @
4d4d7f90
...
@@ -113,9 +113,9 @@
...
@@ -113,9 +113,9 @@
<p>
<p>
<b-badge
variant=
"light"
>
Funding category (eg. for RTR):
</b-badge>
<b-badge
variant=
"light"
>
Funding category (eg. for RTR):
</b-badge>
<!-- TODO: discuss: should this be visible to show owners or only to administrators? -->
<!-- TODO: discuss: should this be visible to show owners or only to administrators? -->
<span
v-if=
"loaded.
rtr
category"
>
<span
v-if=
"loaded.
funding
category"
>
<span
v-if=
"current.
rtr
category.length === 0"
><small><i>
(none set)
</i></small></span>
<span
v-if=
"current.
funding
category.length === 0"
><small><i>
(none set)
</i></small></span>
<span
v-else
>
{{ current.
rtr
category[0].
rtr
category }}
</span>
<span
v-else
>
{{ current.
funding
category[0].
funding
category }}
</span>
<img
src=
"../assets/16x16/emblem-system.png"
alt=
"edit"
v-on:click=
"notYetImplemented"
/>
<img
src=
"../assets/16x16/emblem-system.png"
alt=
"edit"
v-on:click=
"notYetImplemented"
/>
</span>
</span>
<span
v-else
><img
src=
"../assets/radio.gif"
height=
"24px"
alt=
"loading data"
/></span>
<span
v-else
><img
src=
"../assets/radio.gif"
height=
"24px"
alt=
"loading data"
/></span>
...
@@ -284,7 +284,7 @@ export default {
...
@@ -284,7 +284,7 @@ export default {
languages
:
false
,
languages
:
false
,
topics
:
false
,
topics
:
false
,
musicfocus
:
false
,
musicfocus
:
false
,
rtr
category
:
false
,
funding
category
:
false
,
type
:
false
type
:
false
},
},
current
:
{
current
:
{
...
@@ -293,7 +293,7 @@ export default {
...
@@ -293,7 +293,7 @@ export default {
languages
:
[],
languages
:
[],
topics
:
[],
topics
:
[],
musicfocus
:
[],
musicfocus
:
[],
rtr
category
:
[],
funding
category
:
[],
type
:
[],
type
:
[],
note
:
{}
note
:
{}
}
}
...
@@ -342,7 +342,7 @@ export default {
...
@@ -342,7 +342,7 @@ export default {
this
.
loaded
.
hosts
=
false
this
.
loaded
.
hosts
=
false
this
.
loaded
.
languages
=
false
this
.
loaded
.
languages
=
false
this
.
loaded
.
musicfocus
=
false
this
.
loaded
.
musicfocus
=
false
this
.
loaded
.
rtr
category
=
false
this
.
loaded
.
funding
category
=
false
// set the current show and its ID to whatever we want to switch to now
// set the current show and its ID to whatever we want to switch to now
this
.
currentShow
=
index
this
.
currentShow
=
index
this
.
currentShowID
=
this
.
shows
[
this
.
currentShow
].
id
this
.
currentShowID
=
this
.
shows
[
this
.
currentShow
].
id
...
@@ -451,7 +451,7 @@ export default {
...
@@ -451,7 +451,7 @@ export default {
this
.
loaded
.
categories
=
true
this
.
loaded
.
categories
=
true
}
else
{
}
else
{
for
(
var
i
in
this
.
shows
[
this
.
currentShow
].
category
)
{
for
(
var
i
in
this
.
shows
[
this
.
currentShow
].
category
)
{
axios
.
get
(
process
.
env
.
API_STEERING
+
'
categories/
'
+
this
.
shows
[
this
.
currentShow
].
category
[
i
],
{
axios
.
get
(
process
.
env
.
API_STEERING
+
'
categories/
'
+
this
.
shows
[
this
.
currentShow
].
category
[
i
]
+
'
/
'
,
{
withCredentials
:
true
,
withCredentials
:
true
,
headers
:
{
'
Authorization
'
:
'
Bearer
'
+
this
.
$parent
.
user
.
access_token
}
headers
:
{
'
Authorization
'
:
'
Bearer
'
+
this
.
$parent
.
user
.
access_token
}
}).
then
(
response
=>
{
}).
then
(
response
=>
{
...
@@ -491,7 +491,7 @@ export default {
...
@@ -491,7 +491,7 @@ export default {
this
.
loaded
.
languages
=
true
this
.
loaded
.
languages
=
true
}
else
{
}
else
{
for
(
var
i
in
this
.
shows
[
this
.
currentShow
].
language
)
{
for
(
var
i
in
this
.
shows
[
this
.
currentShow
].
language
)
{
axios
.
get
(
process
.
env
.
API_STEERING
+
'
languages/
'
+
this
.
shows
[
this
.
currentShow
].
language
[
i
],
{
axios
.
get
(
process
.
env
.
API_STEERING
+
'
languages/
'
+
this
.
shows
[
this
.
currentShow
].
language
[
i
]
+
'
/
'
,
{
withCredentials
:
true
,
withCredentials
:
true
,
headers
:
{
'
Authorization
'
:
'
Bearer
'
+
this
.
$parent
.
user
.
access_token
}
headers
:
{
'
Authorization
'
:
'
Bearer
'
+
this
.
$parent
.
user
.
access_token
}
}).
then
(
response
=>
{
}).
then
(
response
=>
{
...
@@ -511,7 +511,7 @@ export default {
...
@@ -511,7 +511,7 @@ export default {
this
.
loaded
.
topics
=
true
this
.
loaded
.
topics
=
true
}
else
{
}
else
{
for
(
var
i
in
this
.
shows
[
this
.
currentShow
].
topic
)
{
for
(
var
i
in
this
.
shows
[
this
.
currentShow
].
topic
)
{
axios
.
get
(
process
.
env
.
API_STEERING
+
'
topics/
'
+
this
.
shows
[
this
.
currentShow
].
topic
[
i
],
{
axios
.
get
(
process
.
env
.
API_STEERING
+
'
topics/
'
+
this
.
shows
[
this
.
currentShow
].
topic
[
i
]
+
'
/
'
,
{
withCredentials
:
true
,
withCredentials
:
true
,
headers
:
{
'
Authorization
'
:
'
Bearer
'
+
this
.
$parent
.
user
.
access_token
}
headers
:
{
'
Authorization
'
:
'
Bearer
'
+
this
.
$parent
.
user
.
access_token
}
}).
then
(
response
=>
{
}).
then
(
response
=>
{
...
@@ -531,7 +531,7 @@ export default {
...
@@ -531,7 +531,7 @@ export default {
this
.
loaded
.
musicfocus
=
true
this
.
loaded
.
musicfocus
=
true
}
else
{
}
else
{
for
(
var
i
in
this
.
shows
[
this
.
currentShow
].
musicfocus
)
{
for
(
var
i
in
this
.
shows
[
this
.
currentShow
].
musicfocus
)
{
axios
.
get
(
process
.
env
.
API_STEERING
+
'
musicfocus/
'
+
this
.
shows
[
this
.
currentShow
].
musicfocus
[
i
],
{
axios
.
get
(
process
.
env
.
API_STEERING
+
'
musicfocus/
'
+
this
.
shows
[
this
.
currentShow
].
musicfocus
[
i
]
+
'
/
'
,
{
withCredentials
:
true
,
withCredentials
:
true
,
headers
:
{
'
Authorization
'
:
'
Bearer
'
+
this
.
$parent
.
user
.
access_token
}
headers
:
{
'
Authorization
'
:
'
Bearer
'
+
this
.
$parent
.
user
.
access_token
}
}).
then
(
response
=>
{
}).
then
(
response
=>
{
...
@@ -545,22 +545,22 @@ export default {
...
@@ -545,22 +545,22 @@ export default {
if
(
!
loadingError
)
this
.
loaded
.
musicfocus
=
true
if
(
!
loadingError
)
this
.
loaded
.
musicfocus
=
true
},
},
getRTRCategory
:
function
()
{
getRTRCategory
:
function
()
{
this
.
current
.
rtr
category
=
[]
this
.
current
.
funding
category
=
[]
var
loadingError
=
false
var
loadingError
=
false
if
(
typeof
this
.
shows
[
this
.
currentShow
].
rtr
category
!==
'
number
'
)
{
if
(
typeof
this
.
shows
[
this
.
currentShow
].
funding
category
!==
'
number
'
)
{
this
.
loaded
.
rtr
category
=
true
this
.
loaded
.
funding
category
=
true
}
else
{
}
else
{
axios
.
get
(
process
.
env
.
API_STEERING
+
'
rtr
categories/
'
+
this
.
shows
[
this
.
currentShow
].
rtr
category
,
{
axios
.
get
(
process
.
env
.
API_STEERING
+
'
funding
categories/
'
+
this
.
shows
[
this
.
currentShow
].
funding
category
+
'
/
'
,
{
withCredentials
:
true
,
withCredentials
:
true
,
headers
:
{
'
Authorization
'
:
'
Bearer
'
+
this
.
$parent
.
user
.
access_token
}
headers
:
{
'
Authorization
'
:
'
Bearer
'
+
this
.
$parent
.
user
.
access_token
}
}).
then
(
response
=>
{
}).
then
(
response
=>
{
this
.
current
.
rtr
category
.
push
(
response
.
data
)
this
.
current
.
funding
category
.
push
(
response
.
data
)
}).
catch
(
error
=>
{
}).
catch
(
error
=>
{
loadingError
=
true
loadingError
=
true
alert
(
'
There was an error fetching RTR category from the server:
'
+
error
)
alert
(
'
There was an error fetching RTR category from the server:
'
+
error
)
})
})
}
}
if
(
!
loadingError
)
this
.
loaded
.
rtr
category
=
true
if
(
!
loadingError
)
this
.
loaded
.
funding
category
=
true
},
},
getType
:
function
()
{
getType
:
function
()
{
this
.
current
.
type
=
[]
this
.
current
.
type
=
[]
...
@@ -568,7 +568,7 @@ export default {
...
@@ -568,7 +568,7 @@ export default {
if
(
typeof
this
.
shows
[
this
.
currentShow
].
type
!==
'
number
'
)
{
if
(
typeof
this
.
shows
[
this
.
currentShow
].
type
!==
'
number
'
)
{
this
.
loaded
.
type
=
true
this
.
loaded
.
type
=
true
}
else
{
}
else
{
axios
.
get
(
process
.
env
.
API_STEERING
+
'
types/
'
+
this
.
shows
[
this
.
currentShow
].
type
,
{
axios
.
get
(
process
.
env
.
API_STEERING
+
'
types/
'
+
this
.
shows
[
this
.
currentShow
].
type
+
'
/
'
,
{
withCredentials
:
true
,
withCredentials
:
true
,
headers
:
{
'
Authorization
'
:
'
Bearer
'
+
this
.
$parent
.
user
.
access_token
}
headers
:
{
'
Authorization
'
:
'
Bearer
'
+
this
.
$parent
.
user
.
access_token
}
}).
then
(
response
=>
{
}).
then
(
response
=>
{
...
...
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