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
42a441aa
Commit
42a441aa
authored
7 years ago
by
kevalbhatt
Committed by
Madhan Neethiraj
7 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-1640: fix - entity update UI does not shows empty value for array-entity attributes
Signed-off-by:
Madhan Neethiraj
<
madhan@apache.org
>
parent
543a85d7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
CreateEntityLayoutView.js
dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
+5
-2
SearchResultLayoutView.js
dashboardv2/public/js/views/search/SearchResultLayoutView.js
+1
-1
No files found.
dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
View file @
42a441aa
...
...
@@ -438,6 +438,9 @@ define(['require',
}
else
{
splitTypeName
=
value
.
typeName
;
}
if
(
!
this
.
guid
)
{
disabled
=
value
.
isOptional
;
}
return
'<select class="form-control row-margin-bottom entityInputBox '
+
(
value
.
isOptional
===
true
?
"false"
:
"true"
)
+
'" data-type="'
+
value
.
typeName
+
'" data-key="'
+
value
.
name
+
'" '
+
(
disabled
?
'disabled data-skip="true"'
:
""
)
+
' data-id="entitySelectData" data-queryData="'
+
splitTypeName
+
'">'
+
(
this
.
guid
?
entityValue
:
""
)
+
'</select>'
;
}
...
...
@@ -504,7 +507,7 @@ define(['require',
++
this
.
asyncFetchLOVCounter
;
this
.
searchCollection
.
fetch
({
reset
:
true
});
}
return
this
.
getSelect
(
value
,
entityValue
,
value
.
isOptional
);
return
this
.
getSelect
(
value
,
entityValue
,
true
);
}
}
return
this
.
getSelect
(
value
,
entityValue
,
false
);
// Don't disable select for non entity attributes.
...
...
@@ -766,7 +769,7 @@ define(['require',
var
storeEntity
=
that
.
selectStoreCollection
.
findWhere
({
guid
:
dataValue
.
guid
});
var
refEntiyFound
=
referredEntities
[
dataValue
.
guid
]
if
(
storeEntity
)
{
var
name
=
Utils
.
getName
(
storeEntity
,
'displayText'
);
var
name
=
Utils
.
getName
(
storeEntity
.
toJSON
()
,
'displayText'
);
}
else
if
(
!
storeEntity
&&
refEntiyFound
&&
refEntiyFound
.
typeName
)
{
that
.
selectStoreCollection
.
push
(
refEntiyFound
);
var
name
=
Utils
.
getName
(
refEntiyFound
,
'displayText'
);
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/search/SearchResultLayoutView.js
View file @
42a441aa
...
...
@@ -291,7 +291,7 @@ define(['require',
if
(
Globals
.
taxonomy
)
{
multiAssignDataTerm
=
'<a href="javascript:void(0)" class="inputAssignTag multiSelect" style="display:none" data-id="addTerm"><i class="fa fa-folder-o"></i>'
+
" "
+
'Assign Term</a>'
;
}
if
(
Globals
.
entityCreate
&&
Globals
.
entityTypeConfList
)
{
if
(
Globals
.
entityCreate
&&
Globals
.
entityTypeConfList
&&
Utils
.
getUrlState
.
isSearchTab
()
)
{
createEntityTag
=
"<p>If you do not find the entity in search result below then you can"
+
'<a href="javascript:void(0)" data-id="createEntity"> create new entity</a></p>'
;
}
that
.
$
(
'.searchResult'
).
html
(
resultData
+
multiAssignDataTag
+
multiAssignDataTerm
+
createEntityTag
);
...
...
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