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
71d9c6f3
Commit
71d9c6f3
authored
5 years ago
by
kevalbhatt
Committed by
nixonrodrigues
5 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-3410 : UI - Term assigned to historical entity is not visible in Details page.
Signed-off-by:
nixonrodrigues
<
nixon@apache.org
>
parent
660b91af
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
DetailPageLayoutView.js
...ardv2/public/js/views/detail_page/DetailPageLayoutView.js
+3
-3
SearchResultLayoutView.js
dashboardv2/public/js/views/search/SearchResultLayoutView.js
+2
-2
No files found.
dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
View file @
71d9c6f3
...
...
@@ -418,9 +418,9 @@ define(['require',
var
that
=
this
,
termData
=
""
;
_
.
each
(
data
,
function
(
val
)
{
if
(
val
.
relationshipStatus
==
"ACTIVE"
)
{
termData
+=
'<span class="btn btn-action btn-sm btn-icon btn-blue" title='
+
_
.
escape
(
val
.
displayText
)
+
' data-id="termClick"><span>'
+
_
.
escape
(
val
.
displayText
)
+
'</span><i class="fa fa-close
" data-id="deleteTerm" data-guid="'
+
val
.
guid
+
'" data-type="term" title="Remove Term"></i></span>'
;
}
//
if (val.relationshipStatus == "ACTIVE") {
termData
+=
'<span class="btn btn-action btn-sm btn-icon btn-blue" data-id="termClick"><span title='
+
_
.
escape
(
val
.
displayText
)
+
'>'
+
_
.
escape
(
val
.
displayText
)
+
'</span><i class="'
+
(
val
.
relationshipStatus
==
"ACTIVE"
?
'fa fa-close'
:
""
)
+
'
" data-id="deleteTerm" data-guid="'
+
val
.
guid
+
'" data-type="term" title="Remove Term"></i></span>'
;
// }
});
this
.
ui
.
termList
.
find
(
"span.btn"
).
remove
();
this
.
ui
.
termList
.
prepend
(
termData
);
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/search/SearchResultLayoutView.js
View file @
71d9c6f3
...
...
@@ -475,7 +475,7 @@ define(['require',
that
.
ui
.
activePage
.
attr
(
'title'
,
"Page "
+
that
.
activePage
);
that
.
ui
.
activePage
.
text
(
that
.
activePage
);
that
.
renderTableLayoutView
();
if
(
dataLength
>
0
)
{
if
(
dataLength
>
0
)
{
that
.
$
(
'.searchTable'
).
removeClass
(
'noData'
)
}
if
(
Utils
.
getUrlState
.
isSearchTab
()
&&
value
&&
!
value
.
profileDBView
)
{
...
...
@@ -676,7 +676,7 @@ define(['require',
}
if
(
obj
.
status
&&
Enums
.
entityStateReadOnly
[
obj
.
status
])
{
nameHtml
+=
'<button type="button" title="Deleted" class="btn btn-action btn-md deleteBtn"><i class="fa fa-trash"></i></button>'
;
return
'<div class="readOnly readOnlyLink">'
+
nameHtml
+
'</div>'
;
nameHtml
=
'<div class="readOnly readOnlyLink">'
+
nameHtml
+
'</div>'
;
}
return
nameHtml
;
}
...
...
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