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
105d6b7f
Commit
105d6b7f
authored
Oct 12, 2018
by
Abhishek Kadam
Committed by
nixonrodrigues
Oct 13, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-2892: DeleteTag UI Fix for the issue of appending type=classification to the query string.
Signed-off-by:
nixonrodrigues
<
nixon@apache.org
>
parent
e9869cfe
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
12 deletions
+10
-12
VTag.js
dashboardv2/public/js/models/VTag.js
+1
-1
UrlLinks.js
dashboardv2/public/js/utils/UrlLinks.js
+8
-3
TagLayoutView.js
dashboardv2/public/js/views/tag/TagLayoutView.js
+1
-8
No files found.
dashboardv2/public/js/models/VTag.js
View file @
105d6b7f
...
...
@@ -49,7 +49,7 @@ define(['require',
return
this
.
constructor
.
nonCrudOperation
.
call
(
this
,
url
,
'DELETE'
,
options
);
},
deleteTag
:
function
(
options
)
{
var
url
=
UrlLinks
.
classificationDefApiUrl
(
options
.
typeName
);
var
url
=
UrlLinks
.
getDefApiUrl
(
null
,
options
.
typeName
);
return
this
.
constructor
.
nonCrudOperation
.
call
(
this
,
url
,
'DELETE'
,
options
);
},
saveTagAttribute
:
function
(
options
)
{
...
...
dashboardv2/public/js/utils/UrlLinks.js
View file @
105d6b7f
...
...
@@ -41,11 +41,16 @@ define(['require', 'utils/Enums', 'utils/Utils', 'underscore'], function(require
return
this
.
getDefApiUrl
(
'enum'
,
name
);
},
getDefApiUrl
:
function
(
type
,
name
)
{
var
defApiUrl
=
this
.
typedefsUrl
();
var
defApiUrl
=
this
.
typedefsUrl
()
,
defUrl
;
if
(
name
)
{
return
defApiUrl
.
def
+
'/name/'
+
name
+
'?type='
+
typ
e
;
defUrl
=
defApiUrl
.
def
+
'/name/'
+
nam
e
;
}
else
{
return
defApiUrl
.
defs
+
'?excludeInternalTypesAndReferences=true&type='
+
type
;
defUrl
=
defApiUrl
.
defs
;
}
if
(
type
)
{
return
defUrl
+=
'?type='
+
type
;
}
else
{
return
defUrl
;
}
},
entitiesApiUrl
:
function
(
options
)
{
...
...
dashboardv2/public/js/views/tag/TagLayoutView.js
View file @
105d6b7f
...
...
@@ -569,14 +569,7 @@ define(['require',
},
onNotifyOk
:
function
(
data
)
{
var
that
=
this
,
deleteTagData
=
this
.
collection
.
fullCollection
.
findWhere
({
name
:
this
.
tag
}),
classificationData
=
deleteTagData
.
toJSON
(),
deleteJson
=
{
classificationDefs
:
[
classificationData
],
entityDefs
:
[],
enumDefs
:
[],
structDefs
:
[]
};
deleteTagData
=
this
.
collection
.
fullCollection
.
findWhere
({
name
:
this
.
tag
});
deleteTagData
.
deleteTag
({
typeName
:
that
.
tag
,
success
:
function
()
{
...
...
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