Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
apollo
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
openSource
apollo
Commits
c8ed6bd6
Commit
c8ed6bd6
authored
Dec 15, 2016
by
lepdou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
UI handle public namespace not exist situation
parent
7e4f6bcc
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
5 deletions
+17
-5
namespace-panel-directive.js
...ces/static/scripts/directive/namespace-panel-directive.js
+3
-4
namespace-panel-master-tab.html
...es/static/views/component/namespace-panel-master-tab.html
+14
-1
No files found.
apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js
View file @
c8ed6bd6
...
...
@@ -222,7 +222,7 @@ function directive($window, toastr, AppUtil, EventManager, PermissionService, Na
}
function
initLinkedNamespace
(
namespace
)
{
if
(
!
namespace
.
isPublic
||
!
namespace
.
isLinkedNamespace
)
{
if
(
!
namespace
.
isPublic
||
!
namespace
.
isLinkedNamespace
||
namespace
.
format
!=
'properties'
)
{
return
;
}
//load public namespace
...
...
@@ -237,12 +237,11 @@ function directive($window, toastr, AppUtil, EventManager, PermissionService, Na
linkNamespaceItemKeys
.
push
(
key
);
});
publicNamespace
.
viewItems
=
[];
publicNamespace
.
items
.
forEach
(
function
(
item
)
{
var
key
=
item
.
item
.
key
;
if
(
key
){
if
(
key
)
{
publicNamespace
.
viewItems
.
push
(
item
);
}
...
...
@@ -250,7 +249,7 @@ function directive($window, toastr, AppUtil, EventManager, PermissionService, Na
if
(
item
.
isModified
||
item
.
isDeleted
)
{
publicNamespace
.
isModified
=
true
;
}
else
if
(
key
){
}
else
if
(
key
)
{
publicNamespace
.
hasPublishedItem
=
true
;
}
});
...
...
apollo-portal/src/main/resources/static/views/component/namespace-panel-master-tab.html
View file @
c8ed6bd6
...
...
@@ -373,7 +373,8 @@
</div>
<!--link namespace's public namespace-->
<div
class=
"panel panel-default"
ng-if=
"namespace.isLinkedNamespace"
>
<div
ng-if=
"namespace.isLinkedNamespace"
>
<div
class=
"panel panel-default"
ng-if=
"namespace.publicNamespace"
>
<div
class=
"panel-heading"
>
<div
class=
"row"
>
<div
class=
"padding-top-5 col-md-4"
>
...
...
@@ -567,6 +568,18 @@
<h5>
无公共的配置
</h5>
</div>
</div>
<div
class=
"panel panel-default"
ng-if=
"!namespace.publicNamespace"
>
<div
class=
"panel-heading"
>
公共的配置
</div>
<div
class=
"panel-body text-center"
>
当前公共namespace的所有者
<a
href=
"/config.html?#/appid={{namespace.parentAppId}}"
target=
"_blank"
>
{{namespace.parentAppId}}
</a>
没有关联此namespace,请联系{{namespace.parentAppId}}的所有者在{{namespace.parentAppId}}项目里关联此namespace
</div>
</div>
</div>
</div>
<!--text view-->
...
...
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