Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
5e9f0bea
Commit
5e9f0bea
authored
Mar 29, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changes after review
parent
5cad1401
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
19 deletions
+17
-19
app/assets/javascripts/environments/components/environment.js
...assets/javascripts/environments/components/environment.js
+0
-2
app/assets/javascripts/environments/components/environments_table.js
...javascripts/environments/components/environments_table.js
+15
-15
app/assets/javascripts/environments/services/environments_service.js
...javascripts/environments/services/environments_service.js
+2
-2
No files found.
app/assets/javascripts/environments/components/environment.js
View file @
5e9f0bea
...
@@ -132,8 +132,6 @@ export default Vue.component('environment-component', {
...
@@ -132,8 +132,6 @@ export default Vue.component('environment-component', {
.
then
(
resp
=>
resp
.
json
())
.
then
(
resp
=>
resp
.
json
())
.
then
((
response
)
=>
{
.
then
((
response
)
=>
{
this
.
store
.
setfolderContent
(
folder
,
response
.
environments
);
this
.
store
.
setfolderContent
(
folder
,
response
.
environments
);
})
.
then
(()
=>
{
this
.
isLoadingFolderContent
=
false
;
this
.
isLoadingFolderContent
=
false
;
})
})
.
catch
(()
=>
{
.
catch
(()
=>
{
...
...
app/assets/javascripts/environments/components/environments_table.js
View file @
5e9f0bea
...
@@ -73,15 +73,15 @@ export default {
...
@@ -73,15 +73,15 @@ export default {
</td>
</td>
</tr>
</tr>
<t
r v-if="!isLoadingFolderContent"
<t
emplate v-else>
is="environment-item"
<tr
is="environment-item"
v-for="children in model.children"
v-for="children in model.children"
:model="children"
:model="children"
:can-create-deployment="canCreateDeployment"
:can-create-deployment="canCreateDeployment"
:can-read-environment="canReadEnvironment"
:can-read-environment="canReadEnvironment"
:service="service"></tr>
:service="service"></tr>
<tr v-if="!isLoadingFolderContent"
>
<tr
>
<td colspan="6" class="text-center">
<td colspan="6" class="text-center">
<a :href="folderUrl(model)" class="btn btn-default">
<a :href="folderUrl(model)" class="btn btn-default">
Show all
Show all
...
@@ -89,7 +89,7 @@ export default {
...
@@ -89,7 +89,7 @@ export default {
</td>
</td>
</tr>
</tr>
</template>
</template>
</template>
</template>
</template>
</tbody>
</tbody>
</table>
</table>
...
...
app/assets/javascripts/environments/services/environments_service.js
View file @
5e9f0bea
...
@@ -7,6 +7,7 @@ Vue.use(VueResource);
...
@@ -7,6 +7,7 @@ Vue.use(VueResource);
export
default
class
EnvironmentsService
{
export
default
class
EnvironmentsService
{
constructor
(
endpoint
)
{
constructor
(
endpoint
)
{
this
.
environments
=
Vue
.
resource
(
endpoint
);
this
.
environments
=
Vue
.
resource
(
endpoint
);
this
.
folderResults
=
3
;
}
}
get
(
scope
,
page
)
{
get
(
scope
,
page
)
{
...
@@ -18,7 +19,6 @@ export default class EnvironmentsService {
...
@@ -18,7 +19,6 @@ export default class EnvironmentsService {
}
}
getFolderContent
(
folderUrl
)
{
getFolderContent
(
folderUrl
)
{
const
results
=
3
;
return
Vue
.
http
.
get
(
`
${
folderUrl
}
.json?per_page=
${
this
.
folderResults
}
`
);
return
Vue
.
http
.
get
(
`
${
folderUrl
}
.json?per_page=
${
results
}
`
);
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment