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
f3708887
Commit
f3708887
authored
Aug 31, 2016
by
Jason Song
Committed by
GitHub
Aug 31, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #397 from lepdou/search_item
bugfix: add view items
parents
588029d6
583b098e
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
namespace-panel-directive.js
...ces/static/scripts/directive/namespace-panel-directive.js
+6
-6
namespace-panel.html
...ain/resources/static/views/component/namespace-panel.html
+1
-1
No files found.
apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js
View file @
f3708887
...
@@ -65,7 +65,7 @@ directive_module.directive('apollonspanel',
...
@@ -65,7 +65,7 @@ directive_module.directive('apollonspanel',
function
initNamespace
(
namespace
,
viewType
)
{
function
initNamespace
(
namespace
,
viewType
)
{
namespace
.
showSearchInput
=
false
;
namespace
.
showSearchInput
=
false
;
namespace
.
sourceItems
=
namespace
.
items
;
namespace
.
viewItems
=
namespace
.
items
;
namespace
.
isPropertiesFormat
=
namespace
.
format
==
'properties'
;
namespace
.
isPropertiesFormat
=
namespace
.
format
==
'properties'
;
namespace
.
isTextEditing
=
false
;
namespace
.
isTextEditing
=
false
;
namespace
.
instanceViewType
=
namespace_instance_view_type
.
LATEST_RELEASE
;
namespace
.
instanceViewType
=
namespace_instance_view_type
.
LATEST_RELEASE
;
...
@@ -345,7 +345,7 @@ directive_module.directive('apollonspanel',
...
@@ -345,7 +345,7 @@ directive_module.directive('apollonspanel',
function
parseModel2Text
(
namespace
)
{
function
parseModel2Text
(
namespace
)
{
if
(
namespace
.
sourceI
tems
.
length
==
0
)
{
if
(
namespace
.
i
tems
.
length
==
0
)
{
namespace
.
itemCnt
=
MIN_ROW_SIZE
;
namespace
.
itemCnt
=
MIN_ROW_SIZE
;
return
""
;
return
""
;
}
}
...
@@ -360,7 +360,7 @@ directive_module.directive('apollonspanel',
...
@@ -360,7 +360,7 @@ directive_module.directive('apollonspanel',
}
}
function
parseNotPropertiesText
(
namespace
)
{
function
parseNotPropertiesText
(
namespace
)
{
var
text
=
namespace
.
sourceI
tems
[
0
].
item
.
value
;
var
text
=
namespace
.
i
tems
[
0
].
item
.
value
;
var
lineNum
=
text
.
split
(
"
\
n"
).
length
;
var
lineNum
=
text
.
split
(
"
\
n"
).
length
;
namespace
.
itemCnt
=
lineNum
<
MIN_ROW_SIZE
?
MIN_ROW_SIZE
:
lineNum
;
namespace
.
itemCnt
=
lineNum
<
MIN_ROW_SIZE
?
MIN_ROW_SIZE
:
lineNum
;
return
text
;
return
text
;
...
@@ -369,7 +369,7 @@ directive_module.directive('apollonspanel',
...
@@ -369,7 +369,7 @@ directive_module.directive('apollonspanel',
function
parsePropertiesText
(
namespace
)
{
function
parsePropertiesText
(
namespace
)
{
var
result
=
""
;
var
result
=
""
;
var
itemCnt
=
0
;
var
itemCnt
=
0
;
namespace
.
sourceI
tems
.
forEach
(
function
(
item
)
{
namespace
.
i
tems
.
forEach
(
function
(
item
)
{
//deleted key
//deleted key
if
(
!
item
.
item
.
dataChangeLastModifiedBy
)
{
if
(
!
item
.
item
.
dataChangeLastModifiedBy
)
{
return
;
return
;
...
@@ -398,13 +398,13 @@ directive_module.directive('apollonspanel',
...
@@ -398,13 +398,13 @@ directive_module.directive('apollonspanel',
function
searchItems
(
namespace
)
{
function
searchItems
(
namespace
)
{
var
searchKey
=
namespace
.
searchKey
.
toLowerCase
();
var
searchKey
=
namespace
.
searchKey
.
toLowerCase
();
var
items
=
[];
var
items
=
[];
namespace
.
sourceI
tems
.
forEach
(
function
(
item
)
{
namespace
.
i
tems
.
forEach
(
function
(
item
)
{
var
key
=
item
.
item
.
key
;
var
key
=
item
.
item
.
key
;
if
(
key
&&
key
.
toLowerCase
().
indexOf
(
searchKey
)
>=
0
){
if
(
key
&&
key
.
toLowerCase
().
indexOf
(
searchKey
)
>=
0
){
items
.
push
(
item
);
items
.
push
(
item
);
}
}
});
});
namespace
.
i
tems
=
items
;
namespace
.
viewI
tems
=
items
;
}
}
function
lockCheck
(
namespace
)
{
function
lockCheck
(
namespace
)
{
...
...
apollo-portal/src/main/resources/static/views/component/namespace-panel.html
View file @
f3708887
...
@@ -176,7 +176,7 @@
...
@@ -176,7 +176,7 @@
</thead>
</thead>
<tbody>
<tbody>
<tr
ng-repeat=
"config in namespace.
i
tems"
ng-class=
"{warning:config.isModified}"
<tr
ng-repeat=
"config in namespace.
viewI
tems"
ng-class=
"{warning:config.isModified}"
ng-if=
"config.item.key && !config.isDeleted"
>
ng-if=
"config.item.key && !config.isDeleted"
>
<td
width=
"20%"
title=
"{{config.item.key}}"
>
<td
width=
"20%"
title=
"{{config.item.key}}"
>
<span
ng-bind=
"config.item.key | limitTo: 250"
></span>
<span
ng-bind=
"config.item.key | limitTo: 250"
></span>
...
...
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