Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
73accafe
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,发现更多精彩内容 >>
提交
73accafe
编写于
2月 13, 2017
作者:
F
Filipa Lacerda
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use common util to get parameter name
上级
17897c37
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
9 addition
and
22 deletion
+9
-22
app/assets/javascripts/environments/components/environment.js.es6
...ts/javascripts/environments/components/environment.js.es6
+5
-19
app/assets/javascripts/environments/folder/environments_folder_view.js.es6
...ripts/environments/folder/environments_folder_view.js.es6
+4
-3
未找到文件。
app/assets/javascripts/environments/components/environment.js.es6
浏览文件 @
73accafe
...
...
@@ -7,6 +7,7 @@ const EnvironmentsService = require('../services/environments_service');
const EnvironmentTable = require('./environments_table');
const Store = require('../stores/environments_store');
require('../../vue_shared/components/table_pagination');
require('../../lib/utils/common_utils');
module.exports = Vue.component('environment-component', {
...
...
@@ -45,7 +46,7 @@ module.exports = Vue.component('environment-component', {
computed: {
scope() {
return
this.$options.getQueryParameter
('scope');
return
gl.utils.getParameterByName
('scope');
},
canReadEnvironmentParsed() {
...
...
@@ -67,8 +68,8 @@ module.exports = Vue.component('environment-component', {
* Toggles loading property.
*/
created() {
const scope =
this.$options.getQueryParameter
('scope') || this.visibility;
const pageNumber =
this.$options.getQueryParameter
('page') || this.pageNumber;
const scope =
gl.utils.getParameterByName
('scope') || this.visibility;
const pageNumber =
gl.utils.getParameterByName
('page') || this.pageNumber;
const endpoint = `${this.endpoint}?scope=${scope}&page=${pageNumber}`;
...
...
@@ -96,21 +97,6 @@ module.exports = Vue.component('environment-component', {
});
},
/**
* Transforms the url parameter into an object and
* returns the one requested.
*
* @param {String} param
* @returns {String} The value of the requested parameter.
*/
getQueryParameter(parameter) {
return window.location.search.substring(1).split('&').reduce((acc, param) => {
const paramSplited = param.split('=');
acc[paramSplited[0]] = paramSplited[1];
return acc;
}, {})[parameter];
},
/**
* Converts permission provided as strings to booleans.
* @param {String} string
...
...
@@ -158,7 +144,7 @@ module.exports = Vue.component('environment-component', {
<div :class="cssContainerClass">
<div class="top-area">
<ul v-if="!isLoading" class="nav-links">
<li v-bind:class="{ 'active': scope ===
undefined
|| scope === 'available' }">
<li v-bind:class="{ 'active': scope ===
null
|| scope === 'available' }">
<a :href="projectEnvironmentsPath">
Available
<span class="badge js-available-environments-count">
...
...
app/assets/javascripts/environments/folder/environments_folder_view.js.es6
浏览文件 @
73accafe
...
...
@@ -6,6 +6,7 @@ Vue.use(require('vue-resource'));
const EnvironmentsService = require('../services/environments_service');
const EnvironmentTable = require('../components/environments_table');
const Store = require('../stores/environments_store');
require('../../lib/utils/common_utils');
module.exports = Vue.component('environment-folder-view', {
...
...
@@ -42,7 +43,7 @@ module.exports = Vue.component('environment-folder-view', {
computed: {
scope() {
return
this.$options.getQueryParameter
('scope');
return
gl.utils.getParameterByName
('scope');
},
canReadEnvironmentParsed() {
...
...
@@ -68,8 +69,8 @@ module.exports = Vue.component('environment-folder-view', {
* Toggles loading property.
*/
created() {
const scope =
this.$options.getQueryParameter
('scope') || this.visibility;
const pageNumber =
this.$options.getQueryParameter
('page') || this.pageNumber;
const scope =
gl.utils.getParameterByName
('scope') || this.visibility;
const pageNumber =
gl.utils.getParameterByName
('page') || this.pageNumber;
const endpoint = `${this.endpoint}?scope=${scope}&page=${pageNumber}`;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录