Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
05e57a07
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
05e57a07
编写于
11月 09, 2016
作者:
F
Filipa Lacerda
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Adds rollback and stop component
上级
32784d21
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
105 addition
and
12 deletion
+105
-12
app/assets/javascripts/environments/components/environment_external_url.js.es6
...s/environments/components/environment_external_url.js.es6
+1
-1
app/assets/javascripts/environments/components/environment_item.js.es6
...vascripts/environments/components/environment_item.js.es6
+45
-10
app/assets/javascripts/environments/components/environment_rollback.js.es6
...ripts/environments/components/environment_rollback.js.es6
+31
-0
app/assets/javascripts/environments/components/environment_stop.js.es6
...vascripts/environments/components/environment_stop.js.es6
+26
-0
app/assets/stylesheets/pages/environments.scss
app/assets/stylesheets/pages/environments.scss
+2
-1
未找到文件。
app/assets/javascripts/environments/components/environment_external_url.js.es6
浏览文件 @
05e57a07
...
...
@@ -14,7 +14,7 @@
},
template: `
<a class="btn external_url":href="external_url" :target="_blank">
<a class="btn external_url"
:href="external_url" :target="_blank">
<i class="fa fa-external-link"></i>
</a>
`,
...
...
app/assets/javascripts/environments/components/environment_item.js.es6
浏览文件 @
05e57a07
/*= require vue_common_component/commit
/*= require ./environment_actions
/*= require ./environment_external_url
/*= require ./environment_stop
/*= require ./environment_rollback
/* globals Vue, timeago */
(() => {
...
...
@@ -24,6 +27,8 @@
'commit-component': window.gl.CommitComponent,
'actions-component': window.gl.environmentsList.ActionsComponent,
'external-url-component': window.gl.environmentsList.ExternalUrlComponent,
'stop-component': window.gl.environmentsList.StopComponent,
'rollback-component': window.gl.environmentsList.RollbackComponent,
},
props: ['model', 'can-create-deployment', 'can-create-deployment', 'can-read-environment'],
...
...
@@ -248,11 +253,26 @@
return undefined;
},
retryUrl() {
if (this.model.last_deployment &&
this.model.last_deployment.deployable &&
this.model.last_deployment.deployable.retry_url) {
return this.model.last_deployment.deployable.retry_url;
}
return undefined;
},
isLastDeployment() {
return this.model.last_deployment && this.model.last_deployment['last?'];
},
canReadEnvironmentParsed() {
return true;
return this.$options.convertPermissionToBoolean(this.canReadEnvironment);
},
canCreateDeploymentParsed() {
return true;
return this.$options.convertPermissionToBoolean(this.canCreateDeployment);
},
},
...
...
@@ -295,7 +315,7 @@
template: `
<tr>
<td v-bind:class="
rowClass
">
<td v-bind:class="
{ 'children-row': isChildren}" class="col-sm-2
">
<a v-if="!isFolder" class="environment-name" :href="model.environment_url">
{{model.name}}
</a>
...
...
@@ -313,7 +333,7 @@
</span>
</td>
<td class="deployment-column">
<td class="deployment-column
col-sm-2
">
<span v-if="!isFolder && model.last_deployment && model.last_deployment.iid">
#{{model.last_deployment.iid}}
...
...
@@ -329,7 +349,7 @@
</span>
</td>
<td>
<td
class="col-sm-2"
>
<a v-if="!isFolder && model.last_deployment && model.last_deployment.deployable"
class="build-link"
:href="model.last_deployment.deployable.build_url">
...
...
@@ -337,7 +357,7 @@
</a>
</td>
<td>
<td
class="col-sm-2"
>
<div v-if="!isFolder && model.last_deployment">
<commit-component
:tag="commitTag"
...
...
@@ -353,23 +373,38 @@
</p>
</td>
<td>
<td
class="col-sm-1"
>
<span v-if="!isFolder && model.last_deployment" class="environment-created-date-timeago">
{{createdDate}}
</span>
</td>
<td class="hidden-xs">
<td class="hidden-xs
col-sm-3
">
<div v-if="!isFolder">
<div v-if="hasManualActions && canCreateDeploymentParsed">
<actions-component :actions="manualActions"></actions-component>
<div v-if="hasManualActions && canCreateDeploymentParsed" class="inline">
<actions-component
:actions="manualActions">
</actions-component>
</div>
<div v-if="model.external_url && canReadEnvironmentParsed">
<div v-if="model.external_url && canReadEnvironmentParsed"
class="inline"
>
<external-url-component
:external_url="model.external_url">
</external_url-component>
</div>
<div v-if="isStoppable && canCreateDeploymentParsed" class="inline">
<stop-component
:stop_url="model.environment_url">
</stop-component>
</div>
<div v-if="canRetry && canCreateDeploymentParsed" class="inline">
<rollback-component
:is_last_deployment="isLastDeployment"
:retry_url="retryUrl">
</rollback-component>
</div>
</div>
</td>
</tr>
...
...
app/assets/javascripts/environments/components/environment_rollback.js.es6
0 → 100644
浏览文件 @
05e57a07
/*= require vue
/* global Vue */
(() => {
window.gl = window.gl || {};
window.gl.environmentsList = window.gl.environmentsList || {};
window.gl.environmentsList.RollbackComponent = Vue.component('rollback-component', {
props: {
retry_url: {
type: String,
default: '',
},
is_last_deployment: {
type: Boolean,
default: true,
},
},
template: `
<a class="btn" :href="retry_url" data-method="post" rel="nofollow">
<span v-if="is_last_deployment">
Re-deploy
</span>
<span v-else>
Rollback
</span>
</a>
`,
});
})();
app/assets/javascripts/environments/components/environment_stop.js.es6
0 → 100644
浏览文件 @
05e57a07
/*= require vue
/* global Vue */
(() => {
window.gl = window.gl || {};
window.gl.environmentsList = window.gl.environmentsList || {};
window.gl.environmentsList.StopComponent = Vue.component('stop-component', {
props: {
stop_url: {
type: String,
default: '',
},
},
template: `
<a class="btn stop-env-link"
:href="stop_url"
method="post"
rel="nofollow",
data-confirm="Are you sure you want to stop this environment?">
<i class="fa fa-stop stop-env-icon"></i>
</a>
`,
});
})();
app/assets/stylesheets/pages/environments.scss
浏览文件 @
05e57a07
...
...
@@ -47,7 +47,8 @@
color
:
$gl-dark-link-color
;
}
.stop-env-link
{
.stop-env-link
,
.external-url
{
color
:
$table-text-gray
;
.stop-env-icon
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录