Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
atlas
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
dataplatform
atlas
Commits
cbc4b8a3
Commit
cbc4b8a3
authored
Jun 08, 2018
by
Abhishek Kadam
Committed by
nixonrodrigues
Jun 11, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-2747: UI : Tag attributes of type array are displayed with an extra '>' character
Signed-off-by:
nixonrodrigues
<
nixon@apache.org
>
parent
fff94633
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
1 deletion
+12
-1
Overrides.js
dashboardv2/public/js/utils/Overrides.js
+6
-0
AddTagModalView.js
dashboardv2/public/js/views/tag/AddTagModalView.js
+2
-0
TagDetailTableLayoutView.js
dashboardv2/public/js/views/tag/TagDetailTableLayoutView.js
+4
-1
No files found.
dashboardv2/public/js/utils/Overrides.js
View file @
cbc4b8a3
...
...
@@ -68,6 +68,12 @@ define(['require', 'utils/Utils', 'marionette', 'backgrid', 'asBreadcrumbs', 'jq
}
else
{
return
val
;
}
},
isTypePrimitive
:
function
(
type
)
{
if
(
type
===
"int"
||
type
===
"byte"
||
type
===
"short"
||
type
===
"long"
||
type
===
"float"
||
type
===
"double"
||
type
===
"string"
||
type
===
"boolean"
||
type
===
"date"
)
{
return
true
;
}
return
false
;
}
});
var
getPopoverEl
=
function
(
e
)
{
...
...
dashboardv2/public/js/views/tag/AddTagModalView.js
View file @
cbc4b8a3
...
...
@@ -341,8 +341,10 @@ define(['require',
'<select class="form-control attributeInputVal attrName" data-key="'
+
name
+
'">'
+
str
+
'</select></div>'
);
}
else
{
var
textElement
=
that
.
getElement
(
name
,
typeName
);
if
(
_
.
isTypePrimitive
(
typeName
))
{
that
.
ui
.
tagAttribute
.
append
(
'<div class="form-group"><label>'
+
name
+
'</label>'
+
' ('
+
typeName
+
')'
+
textElement
+
'</div>'
);
}
}
});
that
.
$
(
'input[data-type="date"]'
).
each
(
function
()
{
if
(
!
$
(
this
).
data
(
'daterangepicker'
))
{
...
...
dashboardv2/public/js/views/tag/TagDetailTableLayoutView.js
View file @
cbc4b8a3
...
...
@@ -150,10 +150,13 @@ define(['require',
}),
'sortKey'
),
function
(
sortedObj
)
{
var
val
=
_
.
isNull
(
values
[
sortedObj
.
name
])
?
"-"
:
values
[
sortedObj
.
name
],
key
=
sortedObj
.
name
;
if
(
_
.
isObject
(
val
))
{
val
=
JSON
.
stringify
(
val
);
}
if
(
sortedObj
.
typeName
===
"date"
)
{
val
=
new
Date
(
val
)
}
stringValue
+=
"<tr><td class='html-cell string-cell renderable'>"
+
_
.
escape
(
key
)
+
"</td><td class='html-cell string-cell renderable' data-type=
"
+
sortedObj
.
typeName
+
"
>"
+
_
.
escape
(
val
)
+
"</td>"
;
stringValue
+=
"<tr><td class='html-cell string-cell renderable'>"
+
_
.
escape
(
key
)
+
"</td><td class='html-cell string-cell renderable' data-type=
'"
+
sortedObj
.
typeName
+
"'
>"
+
_
.
escape
(
val
)
+
"</td>"
;
});
tagValue
=
"<div class='mainAttrTable'><table class='attriTable'><tr><th class='html-cell string-cell renderable'>Name</th><th class='html-cell string-cell renderable'>Value</th>"
+
stringValue
+
"</table></div>"
;
}
...
...
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