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
6 years ago
by
Abhishek Kadam
Committed by
nixonrodrigues
6 years ago
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
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
2 deletions
+13
-2
Overrides.js
dashboardv2/public/js/utils/Overrides.js
+6
-0
AddTagModalView.js
dashboardv2/public/js/views/tag/AddTagModalView.js
+3
-1
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
)
{
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/tag/AddTagModalView.js
View file @
cbc4b8a3
...
...
@@ -341,7 +341,9 @@ define(['require',
'<select class="form-control attributeInputVal attrName" data-key="'
+
name
+
'">'
+
str
+
'</select></div>'
);
}
else
{
var
textElement
=
that
.
getElement
(
name
,
typeName
);
that
.
ui
.
tagAttribute
.
append
(
'<div class="form-group"><label>'
+
name
+
'</label>'
+
' ('
+
typeName
+
')'
+
textElement
+
'</div>'
);
if
(
_
.
isTypePrimitive
(
typeName
))
{
that
.
ui
.
tagAttribute
.
append
(
'<div class="form-group"><label>'
+
name
+
'</label>'
+
' ('
+
typeName
+
')'
+
textElement
+
'</div>'
);
}
}
});
that
.
$
(
'input[data-type="date"]'
).
each
(
function
()
{
...
...
This diff is collapsed.
Click to expand it.
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>"
;
}
...
...
This diff is collapsed.
Click to expand it.
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