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
33fdad76
Commit
33fdad76
authored
8 years ago
by
Shwetha GS
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-963 UI: Entity details is not display String array attribute values…
ATLAS-963 UI: Entity details is not display String array attribute values correctly (kevalbhatt18 via shwethags)
parent
b731f64a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
12 deletions
+29
-12
CommonViewFunction.js
dashboardv2/public/js/utils/CommonViewFunction.js
+25
-9
release-log.txt
release-log.txt
+4
-3
No files found.
dashboardv2/public/js/utils/CommonViewFunction.js
View file @
33fdad76
...
@@ -144,7 +144,8 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob
...
@@ -144,7 +144,8 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob
});
});
}
}
_
.
keys
(
valueObject
).
map
(
function
(
key
)
{
_
.
keys
(
valueObject
).
map
(
function
(
key
)
{
var
keyValue
=
valueObject
[
key
];
var
keyValue
=
valueObject
[
key
],
valueOfArray
=
[];
if
(
_
.
isArray
(
keyValue
))
{
if
(
_
.
isArray
(
keyValue
))
{
var
subLink
=
""
;
var
subLink
=
""
;
for
(
var
i
=
0
;
i
<
keyValue
.
length
;
i
++
)
{
for
(
var
i
=
0
;
i
<
keyValue
.
length
;
i
++
)
{
...
@@ -152,14 +153,27 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob
...
@@ -152,14 +153,27 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob
id
=
undefined
,
id
=
undefined
,
tempLink
=
""
,
tempLink
=
""
,
readOnly
=
false
;
readOnly
=
false
;
if
(
_
.
isObject
(
inputOutputField
.
id
))
{
if
(
inputOutputField
)
{
id
=
inputOutputField
.
id
.
id
;
if
(
_
.
isObject
(
inputOutputField
.
id
))
{
if
(
Globals
.
entityStateReadOnly
[
inputOutputField
.
id
.
state
])
{
id
=
inputOutputField
.
id
.
id
;
readOnly
=
inputOutputField
.
id
.
state
if
(
Globals
.
entityStateReadOnly
[
inputOutputField
.
id
.
state
])
{
readOnly
=
inputOutputField
.
id
.
state
}
}
else
if
(
inputOutputField
.
id
)
{
id
=
inputOutputField
.
id
;
}
else
if
(
_
.
isString
(
inputOutputField
)
||
_
.
isBoolean
(
inputOutputField
)
||
_
.
isNumber
(
inputOutputField
))
{
valueOfArray
.
push
(
'<span>'
+
inputOutputField
+
'</span>'
);
}
else
if
(
_
.
isObject
(
inputOutputField
))
{
_
.
each
(
inputOutputField
,
function
(
objValue
,
objKey
)
{
var
value
=
objValue
;
if
(
_
.
isObject
(
value
))
{
value
=
JSON
.
stringify
(
value
);
}
valueOfArray
.
push
(
'<span>'
+
objKey
+
':'
+
value
+
'</span>'
);
});
}
}
}
else
{
id
=
inputOutputField
.
id
;
}
}
if
(
id
)
{
if
(
id
)
{
if
(
inputOutputField
.
values
)
{
if
(
inputOutputField
.
values
)
{
if
(
inputOutputField
.
values
.
name
)
{
if
(
inputOutputField
.
values
.
name
)
{
...
@@ -175,7 +189,6 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob
...
@@ -175,7 +189,6 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob
fetchInputOutputValue
(
id
);
fetchInputOutputValue
(
id
);
tempLink
+=
'<div data-id="'
+
id
+
'"></div>'
;
tempLink
+=
'<div data-id="'
+
id
+
'"></div>'
;
}
}
}
}
if
(
readOnly
)
{
if
(
readOnly
)
{
tempLink
+=
'<button title="Deleted" class="btn btn-atlasAction btn-atlas deleteBtn"><i class="fa fa-trash"></i></button>'
;
tempLink
+=
'<button title="Deleted" class="btn btn-atlasAction btn-atlas deleteBtn"><i class="fa fa-trash"></i></button>'
;
...
@@ -183,11 +196,14 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob
...
@@ -183,11 +196,14 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob
}
else
{
}
else
{
if
(
tempLink
.
search
(
'href'
)
!=
-
1
)
{
if
(
tempLink
.
search
(
'href'
)
!=
-
1
)
{
subLink
+=
'<div>'
+
tempLink
+
'</div>'
subLink
+=
'<div>'
+
tempLink
+
'</div>'
}
else
{
}
else
if
(
tempLink
.
length
)
{
subLink
+=
tempLink
subLink
+=
tempLink
}
}
}
}
}
}
if
(
valueOfArray
.
length
)
{
subLink
=
valueOfArray
.
join
(
', '
);
}
table
+=
'<tr><td>'
+
key
+
'</td><td>'
+
subLink
+
'</td></tr>'
;
table
+=
'<tr><td>'
+
key
+
'</td><td>'
+
subLink
+
'</td></tr>'
;
}
else
if
(
_
.
isObject
(
keyValue
))
{
}
else
if
(
_
.
isObject
(
keyValue
))
{
var
id
=
undefined
,
var
id
=
undefined
,
...
...
This diff is collapsed.
Click to expand it.
release-log.txt
View file @
33fdad76
...
@@ -6,6 +6,10 @@ INCOMPATIBLE CHANGES:
...
@@ -6,6 +6,10 @@ INCOMPATIBLE CHANGES:
ALL CHANGES:
ALL CHANGES:
ATLAS-963 UI: Entity details is not display String array attribute values correctly (kevalbhatt18 via shwethags)
ATLAS-988 HiveHookIT.testInsertIntoTable is broken (svimal2106 via shwethags)
ATLAS-655 Please delete old releases from mirroring system (shwethags)
ATLAS-970 Remove glyphicon from login.jsp (kevalbhatt18 via shwethags)
ATLAS-966 Exit execution of import_hive.sh if HIVE_HOME is not set (svimal2106 via sumasai)
ATLAS-966 Exit execution of import_hive.sh if HIVE_HOME is not set (svimal2106 via sumasai)
ATLAS-917 Add hdfs paths to process qualified name for non-partition based queries (sumasai)
ATLAS-917 Add hdfs paths to process qualified name for non-partition based queries (sumasai)
...
@@ -37,9 +41,6 @@ ATLAS-409 Atlas will not import avro tables with schema read from a file (dosset
...
@@ -37,9 +41,6 @@ ATLAS-409 Atlas will not import avro tables with schema read from a file (dosset
ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via shwethags)
ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via shwethags)
ALL CHANGES:
ALL CHANGES:
ATLAS-988 HiveHookIT.testInsertIntoTable is broken (svimal2106 via shwethags)
ATLAS-655 Please delete old releases from mirroring system (shwethags)
ATLAS-970 Remove glyphicon from login.jsp (kevalbhatt18 via shwethags)
ATLAS-959 Exception while writing to audit log. [java.io.IOException: No FileSystem for scheme: hdfs] (saqeeb.s via sumasai)
ATLAS-959 Exception while writing to audit log. [java.io.IOException: No FileSystem for scheme: hdfs] (saqeeb.s via sumasai)
ATLAS-967 Remove unused logo file and footer. (kevalbhatt18 via yhemanth)
ATLAS-967 Remove unused logo file and footer. (kevalbhatt18 via yhemanth)
ATLAS-964 Cleanup NOTICE and LICENSE (shwethags)
ATLAS-964 Cleanup NOTICE and LICENSE (shwethags)
...
...
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