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
714423c9
Commit
714423c9
authored
Nov 13, 2019
by
sameer79
Committed by
nixonrodrigues
Nov 14, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-3523: UI doesn't pick _CLASSIFIED , _NOT_CLASSIFIED on selecting the same.
Signed-off-by:
nixonrodrigues
<
nixon@apache.org
>
parent
a9672da0
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
28 additions
and
17 deletions
+28
-17
Router.js
dashboardv2/public/js/router/Router.js
+8
-3
Enums.js
dashboardv2/public/js/utils/Enums.js
+4
-3
DetailPageLayoutView.js
...ardv2/public/js/views/detail_page/DetailPageLayoutView.js
+2
-2
GlossaryDetailLayoutView.js
...rdv2/public/js/views/glossary/GlossaryDetailLayoutView.js
+1
-1
Router.js
dashboardv3/public/js/router/Router.js
+7
-1
Enums.js
dashboardv3/public/js/utils/Enums.js
+3
-4
DetailPageLayoutView.js
...ardv3/public/js/views/detail_page/DetailPageLayoutView.js
+2
-2
GlossaryDetailLayoutView.js
...rdv3/public/js/views/glossary/GlossaryDetailLayoutView.js
+1
-1
No files found.
dashboardv2/public/js/router/Router.js
View file @
714423c9
...
...
@@ -24,8 +24,9 @@ define([
'utils/Globals'
,
'utils/Utils'
,
'utils/UrlLinks'
,
'utils/Enums'
,
'collection/VGlossaryList'
],
function
(
$
,
_
,
Backbone
,
App
,
Globals
,
Utils
,
UrlLinks
,
VGlossaryList
)
{
],
function
(
$
,
_
,
Backbone
,
App
,
Globals
,
Utils
,
UrlLinks
,
Enums
,
VGlossaryList
)
{
var
AppRouter
=
Backbone
.
Router
.
extend
({
routes
:
{
// Define some URL routes
...
...
@@ -323,6 +324,11 @@ define([
}
}
});
_
.
each
(
Enums
.
addOnClassification
,
function
(
classificationName
)
{
if
(
classificationName
===
tagValidate
)
{
isTagPresent
=
true
;
}
});
if
(
!
isTagPresent
)
{
paramObj
.
tag
=
null
;
}
...
...
@@ -373,4 +379,4 @@ define([
}
});
return
AppRouter
;
});
\ No newline at end of file
});
dashboardv2/public/js/utils/Enums.js
View file @
714423c9
...
...
@@ -35,7 +35,9 @@ define(['require'], function(require) {
ENTITY_IMPORT_UPDATE
:
"Entity Updated by import"
,
ENTITY_IMPORT_DELETE
:
"Entity Deleted by import"
,
TERM_ADD
:
"Term Added"
,
TERM_DELETE
:
"Term Deleted"
TERM_DELETE
:
"Term Deleted"
,
LABEL_ADD
:
"Label(s) Added"
,
LABEL_DELETE
:
"Label(s) Deleted"
}
Enums
.
entityStateReadOnly
=
{
...
...
@@ -190,4 +192,4 @@ define(['require'], function(require) {
}
};
return
Enums
;
});
\ No newline at end of file
});
dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
View file @
714423c9
...
...
@@ -405,10 +405,10 @@ define(['require',
val
.
entityGuid
===
that
.
id
?
tag
[
'self'
].
push
(
val
)
:
tag
[
'propagated'
].
push
(
val
);
});
_
.
each
(
tag
.
self
,
function
(
val
)
{
tagData
+=
'<span class="btn btn-action btn-sm btn-icon btn-blue" data-id="tagClick"><span title='
+
val
.
typeName
+
' >'
+
val
.
typeName
+
'</span><i class="fa fa-close" data-id="deleteTag" data-type="tag" title="Remove
Tag
"></i></span>'
;
tagData
+=
'<span class="btn btn-action btn-sm btn-icon btn-blue" data-id="tagClick"><span title='
+
val
.
typeName
+
' >'
+
val
.
typeName
+
'</span><i class="fa fa-close" data-id="deleteTag" data-type="tag" title="Remove
Classification
"></i></span>'
;
});
_
.
each
(
tag
.
propagated
,
function
(
val
)
{
var
crossButton
=
'<i class="fa fa-close" data-id="deleteTag" data-entityguid="'
+
val
.
entityGuid
+
'" data-type="tag" title="Remove
Tag
"></i>'
;
var
crossButton
=
'<i class="fa fa-close" data-id="deleteTag" data-entityguid="'
+
val
.
entityGuid
+
'" data-type="tag" title="Remove
Classification
"></i>'
;
propagatedTagListData
+=
'<span class="btn btn-action btn-sm btn-icon btn-blue" title='
+
val
.
typeName
+
' data-id="tagClick"><span>'
+
val
.
typeName
+
'</span>'
+
((
that
.
id
!==
val
.
entityGuid
&&
val
.
entityStatus
===
"DELETED"
)
?
crossButton
:
""
)
+
'</span>'
;
});
propagatedTagListData
!==
""
?
this
.
ui
.
propagatedTagDiv
.
show
()
:
this
.
ui
.
propagatedTagDiv
.
hide
();
...
...
dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
View file @
714423c9
...
...
@@ -301,7 +301,7 @@ define(['require',
var
that
=
this
,
tagData
=
""
;
_
.
each
(
tagObject
,
function
(
val
)
{
tagData
+=
'<span class="btn btn-action btn-sm btn-icon btn-blue" data-id="tagClickTerm"><span title='
+
val
.
typeName
+
'>'
+
val
.
typeName
+
'</span><i class="fa fa-close" data-id="removeTagTerm" data-type="tag" title="Remove
Tag
"></i></span>'
;
tagData
+=
'<span class="btn btn-action btn-sm btn-icon btn-blue" data-id="tagClickTerm"><span title='
+
val
.
typeName
+
'>'
+
val
.
typeName
+
'</span><i class="fa fa-close" data-id="removeTagTerm" data-type="tag" title="Remove
Classification
"></i></span>'
;
});
this
.
ui
.
tagList
.
find
(
"span.btn"
).
remove
();
this
.
ui
.
tagList
.
prepend
(
tagData
);
...
...
dashboardv3/public/js/router/Router.js
View file @
714423c9
...
...
@@ -24,8 +24,9 @@ define([
"utils/Globals"
,
"utils/Utils"
,
"utils/UrlLinks"
,
'utils/Enums'
,
"collection/VGlossaryList"
],
function
(
$
,
_
,
Backbone
,
App
,
Globals
,
Utils
,
UrlLinks
,
VGlossaryList
)
{
],
function
(
$
,
_
,
Backbone
,
App
,
Globals
,
Utils
,
UrlLinks
,
Enums
,
VGlossaryList
)
{
var
AppRouter
=
Backbone
.
Router
.
extend
({
routes
:
{
// Define some URL routes
...
...
@@ -300,6 +301,11 @@ define([
}
}
});
_
.
each
(
Enums
.
addOnClassification
,
function
(
classificationName
)
{
if
(
classificationName
===
tagValidate
)
{
isTagPresent
=
true
;
}
});
if
(
!
isTagPresent
)
{
paramObj
.
tag
=
null
;
}
...
...
dashboardv3/public/js/utils/Enums.js
View file @
714423c9
...
...
@@ -36,8 +36,8 @@ define(['require'], function(require) {
ENTITY_IMPORT_DELETE
:
"Entity Deleted by import"
,
TERM_ADD
:
"Term Added"
,
TERM_DELETE
:
"Term Deleted"
,
LABEL_ADD
:
"Label Added"
,
LABEL_DELETE
:
"Label
Deleted"
LABEL_ADD
:
"Label
(s)
Added"
,
LABEL_DELETE
:
"Label(s)
Deleted"
}
Enums
.
entityStateReadOnly
=
{
...
...
@@ -192,4 +192,4 @@ define(['require'], function(require) {
}
};
return
Enums
;
});
\ No newline at end of file
});
dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js
View file @
714423c9
...
...
@@ -414,10 +414,10 @@ define(['require',
val
.
entityGuid
===
that
.
id
?
tag
[
'self'
].
push
(
val
)
:
tag
[
'propagated'
].
push
(
val
);
});
_
.
each
(
tag
.
self
,
function
(
val
)
{
tagData
+=
'<span class="btn btn-action btn-sm btn-icon btn-blue" data-id="tagClick"><span title='
+
val
.
typeName
+
' >'
+
val
.
typeName
+
'</span><i class="fa fa-close" data-id="deleteTag" data-type="tag" title="Remove
Tag
"></i></span>'
;
tagData
+=
'<span class="btn btn-action btn-sm btn-icon btn-blue" data-id="tagClick"><span title='
+
val
.
typeName
+
' >'
+
val
.
typeName
+
'</span><i class="fa fa-close" data-id="deleteTag" data-type="tag" title="Remove
Classification
"></i></span>'
;
});
_
.
each
(
tag
.
propagated
,
function
(
val
)
{
var
crossButton
=
'<i class="fa fa-close" data-id="deleteTag" data-entityguid="'
+
val
.
entityGuid
+
'" data-type="tag" title="Remove
Tag
"></i>'
;
var
crossButton
=
'<i class="fa fa-close" data-id="deleteTag" data-entityguid="'
+
val
.
entityGuid
+
'" data-type="tag" title="Remove
Classification
"></i>'
;
propagatedTagListData
+=
'<span class="btn btn-action btn-sm btn-icon btn-blue" title='
+
val
.
typeName
+
' data-id="tagClick"><span>'
+
val
.
typeName
+
'</span>'
+
((
that
.
id
!==
val
.
entityGuid
&&
val
.
entityStatus
===
"DELETED"
)
?
crossButton
:
""
)
+
'</span>'
;
});
propagatedTagListData
!==
""
?
this
.
ui
.
propagatedTagDiv
.
show
()
:
this
.
ui
.
propagatedTagDiv
.
hide
();
...
...
dashboardv3/public/js/views/glossary/GlossaryDetailLayoutView.js
View file @
714423c9
...
...
@@ -316,7 +316,7 @@ define(['require',
var
that
=
this
,
tagData
=
""
;
_
.
each
(
tagObject
,
function
(
val
)
{
tagData
+=
'<span class="btn btn-action btn-sm btn-icon btn-blue" data-id="tagClickTerm"><span title='
+
val
.
typeName
+
'>'
+
val
.
typeName
+
'</span><i class="fa fa-close" data-id="removeTagTerm" data-type="tag" title="Remove
Tag
"></i></span>'
;
tagData
+=
'<span class="btn btn-action btn-sm btn-icon btn-blue" data-id="tagClickTerm"><span title='
+
val
.
typeName
+
'>'
+
val
.
typeName
+
'</span><i class="fa fa-close" data-id="removeTagTerm" data-type="tag" title="Remove
Classification
"></i></span>'
;
});
this
.
ui
.
tagList
.
find
(
"span.btn"
).
remove
();
this
.
ui
.
tagList
.
prepend
(
tagData
);
...
...
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