Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
superrain51
apollo
提交
97b749ab
apollo
项目概览
superrain51
/
apollo
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
apollo
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
97b749ab
编写于
9月 28, 2016
作者:
Z
zhangle
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
permission tips
上级
1a1ea212
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
43 addition
and
4 deletion
+43
-4
apollo-portal/src/main/resources/static/config.html
apollo-portal/src/main/resources/static/config.html
+24
-2
apollo-portal/src/main/resources/static/scripts/controller/config/ConfigBaseInfoController.js
...tic/scripts/controller/config/ConfigBaseInfoController.js
+4
-0
apollo-portal/src/main/resources/static/scripts/controller/config/ConfigNamespaceController.js
...ic/scripts/controller/config/ConfigNamespaceController.js
+6
-0
apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js
...ces/static/scripts/directive/namespace-panel-directive.js
+2
-1
apollo-portal/src/main/resources/static/views/component/entrance.html
...l/src/main/resources/static/views/component/entrance.html
+1
-1
apollo-portal/src/main/resources/static/views/component/namespace-panel.html
...ain/resources/static/views/component/namespace-panel.html
+6
-0
未找到文件。
apollo-portal/src/main/resources/static/config.html
浏览文件 @
97b749ab
...
...
@@ -75,10 +75,22 @@
<apolloentrance
apollo-title=
"'添加集群'"
apollo-img-src=
"'plus-orange'"
apollo-href=
"'cluster.html?#/appid=' + pageContext.appId"
ng-show=
"hasCreateClusterPermission"
></apolloentrance>
<span
class=
"list-group-item cursor-pointer hover"
ng-click=
"showMasterPermissionTips()"
ng-show=
"!hasCreateClusterPermission"
>
<div
class=
"row icon-text icon-plus-orange"
>
<p
class=
"btn-title"
>
添加集群
</p>
</div>
</span>
<apolloentrance
apollo-title=
"'添加Namespace'"
apollo-img-src=
"'plus-orange'"
apollo-href=
"'namespace.html?#/appid=' + pageContext.appId"
ng-show=
"hasCreateNamespacePermission"
></apolloentrance>
<span
class=
"list-group-item cursor-pointer hover"
ng-click=
"showMasterPermissionTips()"
ng-show=
"!hasCreateNamespacePermission"
>
<div
class=
"row icon-text icon-plus-orange"
>
<p
class=
"btn-title"
>
添加Namespace
</p>
</div>
</span>
<apolloentrance
apollo-title=
"'项目权限'"
apollo-img-src=
"'user-manage'"
apollo-href=
"'/app/role.html?#/appid=' + pageContext.appId"
...
...
@@ -125,7 +137,8 @@
pre-release-ns=
"prepareReleaseNamespace"
create-item=
"createItem"
edit-item=
"editItem"
pre-delete-item=
"preDeleteItem"
commit-change=
"commitChange"
pre-rollback=
"preRollback"
show-text=
"showText"
></apollonspanel>
pre-rollback=
"preRollback"
show-text=
"showText"
show-no-modify-permission-dialog=
"showNoModifyPermissionDialog"
></apollonspanel>
</div>
<!-- delete modal-->
...
...
@@ -133,7 +146,16 @@
apollo-detail=
"'确定要删除配置吗?'"
apollo-confirm=
"deleteItem"
></apolloconfirmdialog>
<apolloconfirmdialog
apollo-dialog-id=
"'releaseNoPermissionDialog'"
apollo-title=
"'发布'"
apollo-detail=
"'您没有发布权限哦~ 请找 ' + masterUsers + ' 分配权限'"
apollo-detail=
"'您没有发布权限哦~ 请找项目管理员 ' + masterUsers + ' 分配发布权限'"
apollo-show-cancel-btn=
"false"
></apolloconfirmdialog>
<apolloconfirmdialog
apollo-dialog-id=
"'modifyNoPermissionDialog'"
apollo-title=
"'申请配置权限'"
apollo-detail=
"'请找项目管理员 ' + masterUsers + ' 分配编辑或发布权限'"
apollo-show-cancel-btn=
"false"
></apolloconfirmdialog>
<apolloconfirmdialog
apollo-dialog-id=
"'masterNoPermissionDialog'"
apollo-title=
"'申请配置权限'"
apollo-detail=
"'您不是项目管理员, 只有项目管理员才有添加集群、namespace的权限。
如需管理员权限,请找项目管理员 ' + masterUsers + ' 分配管理员权限'"
apollo-show-cancel-btn=
"false"
></apolloconfirmdialog>
<apolloconfirmdialog
apollo-dialog-id=
"'namespaceLockedDialog'"
apollo-title=
"'编辑受限'"
...
...
apollo-portal/src/main/resources/static/scripts/controller/config/ConfigBaseInfoController.js
浏览文件 @
97b749ab
...
...
@@ -207,5 +207,9 @@ application_module.controller("ConfigBaseInfoController",
});
$scope
.
showMasterPermissionTips
=
function
()
{
$
(
"
#masterNoPermissionDialog
"
).
modal
(
'
show
'
);
}
}]);
apollo-portal/src/main/resources/static/scripts/controller/config/ConfigNamespaceController.js
浏览文件 @
97b749ab
...
...
@@ -47,6 +47,8 @@ application_module.controller("ConfigNamespaceController",
$scope
.
showText
=
showText
;
$scope
.
showNoModifyPermissionDialog
=
showNoModifyPermissionDialog
;
$scope
.
releaseBtnDisabled
=
false
;
$scope
.
rollbackBtnDisabled
=
false
;
$scope
.
addItemBtnDisabled
=
false
;
...
...
@@ -383,6 +385,10 @@ application_module.controller("ConfigNamespaceController",
$scope
.
text
=
text
;
$
(
'
#showText
'
).
modal
(
'
show
'
);
}
function
showNoModifyPermissionDialog
()
{
$
(
"
#modifyNoPermissionDialog
"
).
modal
(
'
show
'
);
}
$
(
'
.config-item-container
'
).
removeClass
(
'
hide
'
);
...
...
apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js
浏览文件 @
97b749ab
...
...
@@ -17,7 +17,8 @@ directive_module.directive('apollonspanel',
editItem
:
'
=
'
,
preDeleteItem
:
'
=
'
,
commitChange
:
'
=
'
,
showText
:
'
=
'
showText
:
'
=
'
,
showNoModifyPermissionDialog
:
'
=
'
},
link
:
function
(
scope
,
element
,
attrs
)
{
...
...
apollo-portal/src/main/resources/static/views/component/entrance.html
浏览文件 @
97b749ab
<a
class=
"list-group-item"
href=
"{{href}}"
>
<a
class=
"list-group-item
hover
"
href=
"{{href}}"
>
<div
class=
"row icon-text icon-{{imgSrc}}"
>
<p
class=
"btn-title"
>
{{title}}
</p>
</div>
...
...
apollo-portal/src/main/resources/static/views/component/namespace-panel.html
浏览文件 @
97b749ab
...
...
@@ -57,6 +57,12 @@
<img
src=
"img/sync.png"
>
同步配置
</a>
<a
type=
"button"
class=
"btn btn-danger btn-sm J_tableview_btn"
data-tooltip=
"tooltip"
data-placement=
"bottom"
title=
"您没有任何配置权限,请申请"
ng-click=
"showNoModifyPermissionDialog()"
ng-show=
"!namespace.hasModifyPermission && !namespace.hasReleasePermission"
>
申请配置权限
</a>
</div>
</div>
</header>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录