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
10a11053
Commit
10a11053
authored
5 years ago
by
sameer79
Committed by
kevalbhatt
5 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-3505 : UI: Improve notification message format.
Signed-off-by:
kevalbhatt
<
kbhatt@apache.org
>
parent
d528d275
Show whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
68 additions
and
42 deletions
+68
-42
CommonViewFunction.js
dashboardv2/public/js/utils/CommonViewFunction.js
+3
-2
Messages.js
dashboardv2/public/js/utils/Messages.js
+8
-5
CreateEntityLayoutView.js
dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
+2
-1
EntityLabelDefineView.js
dashboardv2/public/js/views/entity/EntityLabelDefineView.js
+5
-2
EntityUserDefineView.js
dashboardv2/public/js/views/entity/EntityUserDefineView.js
+8
-3
GlossaryLayoutView.js
dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
+1
-1
SaveModalLayoutView.js
...oardv2/public/js/views/search/save/SaveModalLayoutView.js
+2
-2
SaveSearchView.js
dashboardv2/public/js/views/search/save/SaveSearchView.js
+1
-1
TagLayoutView.js
dashboardv2/public/js/views/tag/TagLayoutView.js
+2
-2
CommonViewFunction.js
dashboardv3/public/js/utils/CommonViewFunction.js
+3
-2
Messages.js
dashboardv3/public/js/utils/Messages.js
+8
-5
CreateEntityLayoutView.js
dashboardv3/public/js/views/entity/CreateEntityLayoutView.js
+2
-1
EntityLabelDefineView.js
dashboardv3/public/js/views/entity/EntityLabelDefineView.js
+5
-2
EntityUserDefineView.js
dashboardv3/public/js/views/entity/EntityUserDefineView.js
+8
-3
GlossaryLayoutView.js
dashboardv3/public/js/views/glossary/GlossaryLayoutView.js
+1
-1
SaveModalLayoutView.js
...oardv3/public/js/views/search/save/SaveModalLayoutView.js
+2
-2
SaveSearchView.js
dashboardv3/public/js/views/search/save/SaveSearchView.js
+1
-1
ClassificationTreeLayoutView.js
...blic/js/views/search/tree/ClassificationTreeLayoutView.js
+2
-2
CustomFilterTreeLayoutView.js
...public/js/views/search/tree/CustomFilterTreeLayoutView.js
+1
-1
GlossaryTreeLayoutView.js
...dv3/public/js/views/search/tree/GlossaryTreeLayoutView.js
+1
-1
TagLayoutView.js
dashboardv3/public/js/views/tag/TagLayoutView.js
+2
-2
No files found.
dashboardv2/public/js/utils/CommonViewFunction.js
View file @
10a11053
...
@@ -37,7 +37,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
...
@@ -37,7 +37,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
skipDefaultError
:
true
,
skipDefaultError
:
true
,
success
:
function
(
data
)
{
success
:
function
(
data
)
{
Utils
.
notifySuccess
({
Utils
.
notifySuccess
({
content
:
"Classification "
+
options
.
tagName
+
Messages
.
removeSuccessMessage
content
:
"Classification "
+
options
.
tagName
+
Messages
.
getAbbreviationMsg
(
abbrev
,
'removeSuccessMessage'
)
});
});
if
(
options
.
callback
)
{
if
(
options
.
callback
)
{
options
.
callback
();
options
.
callback
();
...
@@ -716,8 +716,9 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
...
@@ -716,8 +716,9 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
var
ajaxOptions
=
{
var
ajaxOptions
=
{
silent
:
true
,
silent
:
true
,
success
:
function
(
rModel
,
response
)
{
success
:
function
(
rModel
,
response
)
{
var
msgType
=
model
?
"editSuccessMessage"
:
"addSuccessMessage"
;
Utils
.
notifySuccess
({
Utils
.
notifySuccess
({
content
:
messageType
+
ref
.
ui
.
name
.
val
()
+
Messages
[
model
?
"editSuccessMessage"
:
"addSuccessMessage"
]
content
:
messageType
+
ref
.
ui
.
name
.
val
()
+
Messages
.
getAbbreviationMsg
(
false
,
msgType
)
});
});
if
(
options
.
callback
)
{
if
(
options
.
callback
)
{
options
.
callback
(
rModel
);
options
.
callback
(
rModel
);
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/utils/Messages.js
View file @
10a11053
...
@@ -21,14 +21,14 @@ define(['require'], function(require) {
...
@@ -21,14 +21,14 @@ define(['require'], function(require) {
var
Messages
=
{
var
Messages
=
{
defaultErrorMessage
:
"Something went wrong"
,
defaultErrorMessage
:
"Something went wrong"
,
addSuccessMessage
:
"
has been
created successfully"
,
addSuccessMessage
:
" created successfully"
,
addErrorMessage
:
" could not be Created"
,
addErrorMessage
:
" could not be Created"
,
removeTag
:
"Remove Classification Assignment"
,
removeTag
:
"Remove Classification Assignment"
,
deleteSuccessMessage
:
"
has been
deleted successfully"
,
deleteSuccessMessage
:
" deleted successfully"
,
deleteErrorMessage
:
" could not be deleted"
,
deleteErrorMessage
:
" could not be deleted"
,
removeSuccessMessage
:
"
has been
removed successfully"
,
removeSuccessMessage
:
" removed successfully"
,
removeErrorMessage
:
" could not be removed"
,
removeErrorMessage
:
" could not be removed"
,
editSuccessMessage
:
"
has been
updated successfully"
,
editSuccessMessage
:
" updated successfully"
,
assignDeletedEntity
:
" is deleted, Classification cannot be assigned"
,
assignDeletedEntity
:
" is deleted, Classification cannot be assigned"
,
assignTermDeletedEntity
:
" is deleted, Term cannot be assigned"
,
assignTermDeletedEntity
:
" is deleted, Term cannot be assigned"
,
conformation
:
{
conformation
:
{
...
@@ -52,8 +52,11 @@ define(['require'], function(require) {
...
@@ -52,8 +52,11 @@ define(['require'], function(require) {
removeTermfromCategory
:
"Remove Term Assignment"
,
removeTermfromCategory
:
"Remove Term Assignment"
,
removeTermfromEntity
:
"Remove Term Assignment"
,
removeTermfromEntity
:
"Remove Term Assignment"
,
removeCategoryfromTerm
:
"Remove Category Assignment"
removeCategoryfromTerm
:
"Remove Category Assignment"
},
getAbbreviationMsg
:
function
(
abbrev
,
type
)
{
var
msg
=
abbrev
?
"s were"
:
" was"
;
return
msg
+
this
[
type
];
}
}
};
};
return
Messages
;
return
Messages
;
});
});
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
View file @
10a11053
...
@@ -764,8 +764,9 @@ define(['require',
...
@@ -764,8 +764,9 @@ define(['require',
type
:
"POST"
,
type
:
"POST"
,
success
:
function
(
model
,
response
)
{
success
:
function
(
model
,
response
)
{
that
.
modal
.
close
();
that
.
modal
.
close
();
var
msgType
=
that
.
guid
?
'editSuccessMessage'
:
'addSuccessMessage'
;
Utils
.
notifySuccess
({
Utils
.
notifySuccess
({
content
:
"Entity "
+
Messages
[
that
.
guid
?
'editSuccessMessage'
:
'addSuccessMessage'
]
content
:
"Entity "
+
Messages
.
getAbbreviationMsg
(
false
,
msgType
)
});
});
if
(
that
.
guid
&&
that
.
callback
)
{
if
(
that
.
guid
&&
that
.
callback
)
{
that
.
callback
();
that
.
callback
();
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/entity/EntityLabelDefineView.js
View file @
10a11053
...
@@ -92,14 +92,17 @@ define(['require',
...
@@ -92,14 +92,17 @@ define(['require',
data
:
JSON
.
stringify
(
payload
),
data
:
JSON
.
stringify
(
payload
),
type
:
'POST'
,
type
:
'POST'
,
success
:
function
()
{
success
:
function
()
{
var
msg
=
entityJson
.
labels
===
undefined
?
'addSuccessMessage'
:
'editSuccessMessage'
;
var
msg
=
entityJson
.
labels
===
undefined
?
'addSuccessMessage'
:
'editSuccessMessage'
,
caption
=
"One or more label"
;
if
(
payload
.
length
===
0
)
{
if
(
payload
.
length
===
0
)
{
msg
=
'removeSuccessMessage'
;
caption
=
"One or more existing label"
;
that
.
entityModel
.
unset
(
'labels'
);
that
.
entityModel
.
unset
(
'labels'
);
}
else
{
}
else
{
that
.
entityModel
.
set
(
'labels'
,
payload
);
that
.
entityModel
.
set
(
'labels'
,
payload
);
}
}
Utils
.
notifySuccess
({
Utils
.
notifySuccess
({
content
:
"Labels "
+
Messages
[
msg
]
content
:
caption
+
Messages
.
getAbbreviationMsg
(
true
,
msg
)
});
});
that
.
swapItem
=
false
;
that
.
swapItem
=
false
;
that
.
saveLabels
=
false
;
that
.
saveLabels
=
false
;
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/entity/EntityUserDefineView.js
View file @
10a11053
...
@@ -95,7 +95,7 @@ define(['require',
...
@@ -95,7 +95,7 @@ define(['require',
});
});
},
},
onEditAttrClick
:
function
()
{
onEditAttrClick
:
function
()
{
this
.
initialCall
=
fals
e
;
this
.
initialCall
=
this
.
customAttibutes
.
length
>
0
?
false
:
tru
e
;
this
.
setAttributeModal
(
this
.
itemView
);
this
.
setAttributeModal
(
this
.
itemView
);
},
},
structureAttributes
:
function
(
list
)
{
structureAttributes
:
function
(
list
)
{
...
@@ -115,10 +115,15 @@ define(['require',
...
@@ -115,10 +115,15 @@ define(['require',
data
:
JSON
.
stringify
(
payload
),
data
:
JSON
.
stringify
(
payload
),
type
:
'POST'
,
type
:
'POST'
,
success
:
function
()
{
success
:
function
()
{
var
msg
=
that
.
initialCall
?
'addSuccessMessage'
:
'editSuccessMessage'
;
var
msg
=
that
.
initialCall
?
'addSuccessMessage'
:
'editSuccessMessage'
,
caption
=
"One or more user-defined propertie"
;
// 's' will be added in abbreviation function
that
.
customAttibutes
=
list
;
that
.
customAttibutes
=
list
;
if
(
list
.
length
===
0
)
{
msg
=
'removeSuccessMessage'
;
caption
=
"One or more existing user-defined propertie"
;
}
Utils
.
notifySuccess
({
Utils
.
notifySuccess
({
content
:
"User-defined properties "
+
Messages
[
msg
]
content
:
caption
+
Messages
.
getAbbreviationMsg
(
true
,
msg
)
});
});
that
.
swapItem
=
false
;
that
.
swapItem
=
false
;
that
.
saveAttrItems
=
false
;
that
.
saveAttrItems
=
false
;
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
View file @
10a11053
...
@@ -652,7 +652,7 @@ define(['require',
...
@@ -652,7 +652,7 @@ define(['require',
}
}
}
}
Utils
.
notifySuccess
({
Utils
.
notifySuccess
({
content
:
messageType
+
Messages
.
deleteSuccessMessage
content
:
messageType
+
Messages
.
getAbbreviationMsg
(
false
,
'deleteSuccessMessage'
)
});
});
var
url
=
gId
?
'#!/glossary/'
+
gId
:
'#!/glossary'
;
var
url
=
gId
?
'#!/glossary/'
+
gId
:
'#!/glossary'
;
if
(
gId
==
null
)
{
if
(
gId
==
null
)
{
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/search/save/SaveModalLayoutView.js
View file @
10a11053
...
@@ -110,12 +110,12 @@ define(['require',
...
@@ -110,12 +110,12 @@ define(['require',
collectionRef
.
set
(
data
);
collectionRef
.
set
(
data
);
}
}
Utils
.
notifySuccess
({
Utils
.
notifySuccess
({
content
:
obj
.
name
+
Messages
.
editSuccessMessage
content
:
obj
.
name
+
Messages
.
getAbbreviationMsg
(
false
,
"editSuccessMessage"
)
});
});
}
else
{
}
else
{
that
.
collection
.
add
(
data
);
that
.
collection
.
add
(
data
);
Utils
.
notifySuccess
({
Utils
.
notifySuccess
({
content
:
obj
.
name
+
Messages
.
addSuccessMessage
content
:
obj
.
name
+
Messages
.
getAbbreviationMsg
(
false
,
"addSuccessMessage"
)
});
});
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/search/save/SaveSearchView.js
View file @
10a11053
...
@@ -195,7 +195,7 @@ define(['require',
...
@@ -195,7 +195,7 @@ define(['require',
that
.
collection
.
remove
(
model
);
that
.
collection
.
remove
(
model
);
}
}
Utils
.
notifySuccess
({
Utils
.
notifySuccess
({
content
:
options
.
model
.
get
(
'name'
)
+
Messages
.
deleteSuccessMessage
content
:
options
.
model
.
get
(
'name'
)
+
Messages
.
getAbbreviationMsg
(
false
,
'deleteSuccessMessage'
)
});
});
}
}
});
});
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/tag/TagLayoutView.js
View file @
10a11053
...
@@ -493,7 +493,7 @@ define(['require',
...
@@ -493,7 +493,7 @@ define(['require',
that
.
collection
.
fullCollection
.
add
(
classificationDefs
);
that
.
collection
.
fullCollection
.
add
(
classificationDefs
);
that
.
setUrl
(
'#!/tag/tagAttribute/'
+
ref
.
ui
.
tagName
.
val
(),
true
);
that
.
setUrl
(
'#!/tag/tagAttribute/'
+
ref
.
ui
.
tagName
.
val
(),
true
);
Utils
.
notifySuccess
({
Utils
.
notifySuccess
({
content
:
"Classification "
+
that
.
name
+
Messages
.
addSuccessMessage
content
:
"Classification "
+
that
.
name
+
Messages
.
getAbbreviationMsg
(
false
,
'addSuccessMessage'
)
});
});
modal
.
trigger
(
'cancel'
);
modal
.
trigger
(
'cancel'
);
that
.
typeHeaders
.
fetch
({
reset
:
true
});
that
.
typeHeaders
.
fetch
({
reset
:
true
});
...
@@ -574,7 +574,7 @@ define(['require',
...
@@ -574,7 +574,7 @@ define(['require',
typeName
:
that
.
tag
,
typeName
:
that
.
tag
,
success
:
function
()
{
success
:
function
()
{
Utils
.
notifySuccess
({
Utils
.
notifySuccess
({
content
:
"Classification "
+
that
.
tag
+
Messages
.
deleteSuccessMessage
content
:
"Classification "
+
that
.
tag
+
Messages
.
getAbbreviationMsg
(
false
,
'deleteSuccessMessage'
)
});
});
// if deleted tag is prviously searched then remove that tag url from save state of tab.
// if deleted tag is prviously searched then remove that tag url from save state of tab.
var
searchUrl
=
Globals
.
saveApplicationState
.
tabState
.
searchUrl
;
var
searchUrl
=
Globals
.
saveApplicationState
.
tabState
.
searchUrl
;
...
...
This diff is collapsed.
Click to expand it.
dashboardv3/public/js/utils/CommonViewFunction.js
View file @
10a11053
...
@@ -37,7 +37,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
...
@@ -37,7 +37,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
skipDefaultError
:
true
,
skipDefaultError
:
true
,
success
:
function
(
data
)
{
success
:
function
(
data
)
{
Utils
.
notifySuccess
({
Utils
.
notifySuccess
({
content
:
"Classification "
+
options
.
tagName
+
Messages
.
removeSuccessMessage
content
:
"Classification "
+
options
.
tagName
+
Messages
.
getAbbreviationMsg
(
false
,
'removeSuccessMessage'
)
});
});
if
(
options
.
callback
)
{
if
(
options
.
callback
)
{
options
.
callback
();
options
.
callback
();
...
@@ -736,8 +736,9 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
...
@@ -736,8 +736,9 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
var
ajaxOptions
=
{
var
ajaxOptions
=
{
silent
:
true
,
silent
:
true
,
success
:
function
(
rModel
,
response
)
{
success
:
function
(
rModel
,
response
)
{
var
msgType
=
model
?
"editSuccessMessage"
:
"addSuccessMessage"
;
Utils
.
notifySuccess
({
Utils
.
notifySuccess
({
content
:
messageType
+
ref
.
ui
.
name
.
val
()
+
Messages
[
model
?
"editSuccessMessage"
:
"addSuccessMessage"
]
content
:
messageType
+
ref
.
ui
.
name
.
val
()
+
Messages
.
getAbbreviationMsg
(
false
,
msgType
)
});
});
if
(
options
.
callback
)
{
if
(
options
.
callback
)
{
options
.
callback
(
rModel
);
options
.
callback
(
rModel
);
...
...
This diff is collapsed.
Click to expand it.
dashboardv3/public/js/utils/Messages.js
View file @
10a11053
...
@@ -21,14 +21,14 @@ define(['require'], function(require) {
...
@@ -21,14 +21,14 @@ define(['require'], function(require) {
var
Messages
=
{
var
Messages
=
{
defaultErrorMessage
:
"Something went wrong"
,
defaultErrorMessage
:
"Something went wrong"
,
addSuccessMessage
:
"
has been
created successfully"
,
addSuccessMessage
:
" created successfully"
,
addErrorMessage
:
" could not be Created"
,
addErrorMessage
:
" could not be Created"
,
removeTag
:
"Remove Classification Assignment"
,
removeTag
:
"Remove Classification Assignment"
,
deleteSuccessMessage
:
"
has been
deleted successfully"
,
deleteSuccessMessage
:
" deleted successfully"
,
deleteErrorMessage
:
" could not be deleted"
,
deleteErrorMessage
:
" could not be deleted"
,
removeSuccessMessage
:
"
has been
removed successfully"
,
removeSuccessMessage
:
" removed successfully"
,
removeErrorMessage
:
" could not be removed"
,
removeErrorMessage
:
" could not be removed"
,
editSuccessMessage
:
"
has been
updated successfully"
,
editSuccessMessage
:
" updated successfully"
,
assignDeletedEntity
:
" is deleted, Classification cannot be assigned"
,
assignDeletedEntity
:
" is deleted, Classification cannot be assigned"
,
assignTermDeletedEntity
:
" is deleted, Term cannot be assigned"
,
assignTermDeletedEntity
:
" is deleted, Term cannot be assigned"
,
conformation
:
{
conformation
:
{
...
@@ -52,8 +52,11 @@ define(['require'], function(require) {
...
@@ -52,8 +52,11 @@ define(['require'], function(require) {
removeTermfromCategory
:
"Remove Term Assignment"
,
removeTermfromCategory
:
"Remove Term Assignment"
,
removeTermfromEntity
:
"Remove Term Assignment"
,
removeTermfromEntity
:
"Remove Term Assignment"
,
removeCategoryfromTerm
:
"Remove Category Assignment"
removeCategoryfromTerm
:
"Remove Category Assignment"
},
getAbbreviationMsg
:
function
(
abbrev
,
type
)
{
var
msg
=
abbrev
?
"s were"
:
" was"
;
return
msg
+
this
[
type
];
}
}
};
};
return
Messages
;
return
Messages
;
});
});
This diff is collapsed.
Click to expand it.
dashboardv3/public/js/views/entity/CreateEntityLayoutView.js
View file @
10a11053
...
@@ -766,8 +766,9 @@ define(['require',
...
@@ -766,8 +766,9 @@ define(['require',
type
:
"POST"
,
type
:
"POST"
,
success
:
function
(
model
,
response
)
{
success
:
function
(
model
,
response
)
{
that
.
modal
.
close
();
that
.
modal
.
close
();
var
msgType
=
that
.
guid
?
"editSuccessMessage"
:
"addSuccessMessage"
;
Utils
.
notifySuccess
({
Utils
.
notifySuccess
({
content
:
"Entity
"
+
Messages
[
that
.
guid
?
'editSuccessMessage'
:
'addSuccessMessage'
]
content
:
"Entity
"
+
Messages
.
getAbbreviationMsg
(
false
,
msgType
)
});
});
if
(
that
.
guid
&&
that
.
callback
)
{
if
(
that
.
guid
&&
that
.
callback
)
{
that
.
callback
();
that
.
callback
();
...
...
This diff is collapsed.
Click to expand it.
dashboardv3/public/js/views/entity/EntityLabelDefineView.js
View file @
10a11053
...
@@ -92,14 +92,17 @@ define(['require',
...
@@ -92,14 +92,17 @@ define(['require',
data
:
JSON
.
stringify
(
payload
),
data
:
JSON
.
stringify
(
payload
),
type
:
'POST'
,
type
:
'POST'
,
success
:
function
()
{
success
:
function
()
{
var
msg
=
entityJson
.
labels
===
undefined
?
'addSuccessMessage'
:
'editSuccessMessage'
;
var
msg
=
entityJson
.
labels
===
undefined
?
'addSuccessMessage'
:
'editSuccessMessage'
,
caption
=
"One or more label"
;
if
(
payload
.
length
===
0
)
{
if
(
payload
.
length
===
0
)
{
msg
=
'removeSuccessMessage'
;
caption
=
"One or more existing label"
;
that
.
entityModel
.
unset
(
'labels'
);
that
.
entityModel
.
unset
(
'labels'
);
}
else
{
}
else
{
that
.
entityModel
.
set
(
'labels'
,
payload
);
that
.
entityModel
.
set
(
'labels'
,
payload
);
}
}
Utils
.
notifySuccess
({
Utils
.
notifySuccess
({
content
:
"Labels "
+
Messages
[
msg
]
content
:
caption
+
Messages
.
getAbbreviationMsg
(
true
,
msg
)
});
});
that
.
swapItem
=
false
;
that
.
swapItem
=
false
;
that
.
saveLabels
=
false
;
that
.
saveLabels
=
false
;
...
...
This diff is collapsed.
Click to expand it.
dashboardv3/public/js/views/entity/EntityUserDefineView.js
View file @
10a11053
...
@@ -95,7 +95,7 @@ define(['require',
...
@@ -95,7 +95,7 @@ define(['require',
});
});
},
},
onEditAttrClick
:
function
()
{
onEditAttrClick
:
function
()
{
this
.
initialCall
=
fals
e
;
this
.
initialCall
=
this
.
customAttibutes
.
length
>
0
?
false
:
tru
e
;
this
.
setAttributeModal
(
this
.
itemView
);
this
.
setAttributeModal
(
this
.
itemView
);
},
},
structureAttributes
:
function
(
list
)
{
structureAttributes
:
function
(
list
)
{
...
@@ -115,10 +115,15 @@ define(['require',
...
@@ -115,10 +115,15 @@ define(['require',
data
:
JSON
.
stringify
(
payload
),
data
:
JSON
.
stringify
(
payload
),
type
:
'POST'
,
type
:
'POST'
,
success
:
function
()
{
success
:
function
()
{
var
msg
=
that
.
initialCall
?
'addSuccessMessage'
:
'editSuccessMessage'
;
var
msg
=
that
.
initialCall
?
'addSuccessMessage'
:
'editSuccessMessage'
,
caption
=
"One or more user-defined propertie"
;
// 's' will be added in abbreviation function
that
.
customAttibutes
=
list
;
that
.
customAttibutes
=
list
;
if
(
list
.
length
===
0
)
{
msg
=
'removeSuccessMessage'
;
caption
=
"One or more existing user-defined propertie"
;
}
Utils
.
notifySuccess
({
Utils
.
notifySuccess
({
content
:
"User-defined properties "
+
Messages
[
msg
]
content
:
caption
+
Messages
.
getAbbreviationMsg
(
true
,
msg
)
});
});
that
.
swapItem
=
false
;
that
.
swapItem
=
false
;
that
.
saveAttrItems
=
false
;
that
.
saveAttrItems
=
false
;
...
...
This diff is collapsed.
Click to expand it.
dashboardv3/public/js/views/glossary/GlossaryLayoutView.js
View file @
10a11053
...
@@ -653,7 +653,7 @@ define(['require',
...
@@ -653,7 +653,7 @@ define(['require',
}
}
}
}
Utils
.
notifySuccess
({
Utils
.
notifySuccess
({
content
:
messageType
+
Messages
.
deleteSuccessMessage
content
:
messageType
+
Messages
.
getAbbreviationMsg
(
false
,
'deleteSuccessMessage'
)
});
});
var
url
=
gId
?
'#!/glossary/'
+
gId
:
'#!/glossary'
;
var
url
=
gId
?
'#!/glossary/'
+
gId
:
'#!/glossary'
;
if
(
gId
==
null
)
{
if
(
gId
==
null
)
{
...
...
This diff is collapsed.
Click to expand it.
dashboardv3/public/js/views/search/save/SaveModalLayoutView.js
View file @
10a11053
...
@@ -110,12 +110,12 @@ define(['require',
...
@@ -110,12 +110,12 @@ define(['require',
collectionRef
.
set
(
data
);
collectionRef
.
set
(
data
);
}
}
Utils
.
notifySuccess
({
Utils
.
notifySuccess
({
content
:
obj
.
name
+
Messages
.
editSuccessMessage
content
:
obj
.
name
+
Messages
.
getAbbreviationMsg
(
false
,
'editSuccessMessage'
)
});
});
}
else
{
}
else
{
that
.
collection
.
add
(
data
);
that
.
collection
.
add
(
data
);
Utils
.
notifySuccess
({
Utils
.
notifySuccess
({
content
:
obj
.
name
+
Messages
.
addSuccessMessage
content
:
obj
.
name
+
Messages
.
getAbbreviationMsg
(
false
,
'addSuccessMessage'
)
});
});
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
dashboardv3/public/js/views/search/save/SaveSearchView.js
View file @
10a11053
...
@@ -195,7 +195,7 @@ define(['require',
...
@@ -195,7 +195,7 @@ define(['require',
that
.
collection
.
remove
(
model
);
that
.
collection
.
remove
(
model
);
}
}
Utils
.
notifySuccess
({
Utils
.
notifySuccess
({
content
:
options
.
model
.
get
(
'name'
)
+
Messages
.
deleteSuccessMessage
content
:
options
.
model
.
get
(
'name'
)
+
Messages
.
getAbbreviationMsg
(
false
,
'deleteSuccessMessage'
)
});
});
}
}
});
});
...
...
This diff is collapsed.
Click to expand it.
dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
View file @
10a11053
...
@@ -708,7 +708,7 @@ define([
...
@@ -708,7 +708,7 @@ define([
}
}
that
.
options
.
classificationDefCollection
.
fullCollection
.
add
(
classificationDefs
);
that
.
options
.
classificationDefCollection
.
fullCollection
.
add
(
classificationDefs
);
Utils
.
notifySuccess
({
Utils
.
notifySuccess
({
content
:
"Classification "
+
name
+
Messages
.
addSuccessMessage
content
:
"Classification "
+
name
+
Messages
.
getAbbreviationMsg
(
false
,
'addSuccessMessage'
)
});
});
modal
.
trigger
(
"cancel"
);
modal
.
trigger
(
"cancel"
);
that
.
typeHeaders
.
fetch
({
reset
:
true
});
that
.
typeHeaders
.
fetch
({
reset
:
true
});
...
@@ -755,7 +755,7 @@ define([
...
@@ -755,7 +755,7 @@ define([
typeName
:
tagName
,
typeName
:
tagName
,
success
:
function
()
{
success
:
function
()
{
Utils
.
notifySuccess
({
Utils
.
notifySuccess
({
content
:
"Classification "
+
tagName
+
Messages
.
deleteSuccessMessage
content
:
"Classification "
+
tagName
+
Messages
.
getAbbreviationMsg
(
false
,
'deleteSuccessMessage'
)
});
});
// if deleted tag is prviously searched then remove that tag url from save state of tab.
// if deleted tag is prviously searched then remove that tag url from save state of tab.
var
searchUrl
=
Globals
.
saveApplicationState
.
tabState
.
searchUrl
;
var
searchUrl
=
Globals
.
saveApplicationState
.
tabState
.
searchUrl
;
...
...
This diff is collapsed.
Click to expand it.
dashboardv3/public/js/views/search/tree/CustomFilterTreeLayoutView.js
View file @
10a11053
...
@@ -433,7 +433,7 @@ define([
...
@@ -433,7 +433,7 @@ define([
success
:
function
(
model
,
data
)
{
success
:
function
(
model
,
data
)
{
that
.
showDefaultPage
();
that
.
showDefaultPage
();
Utils
.
notifySuccess
({
Utils
.
notifySuccess
({
content
:
options
.
model
.
attributes
.
name
+
Messages
.
deleteSuccessMessage
content
:
options
.
model
.
attributes
.
name
+
Messages
.
getAbbreviationMsg
(
false
,
'deleteSuccessMessage'
)
});
});
}
}
});
});
...
...
This diff is collapsed.
Click to expand it.
dashboardv3/public/js/views/search/tree/GlossaryTreeLayoutView.js
View file @
10a11053
...
@@ -503,7 +503,7 @@ define([
...
@@ -503,7 +503,7 @@ define([
}
}
Utils
.
notifySuccess
({
Utils
.
notifySuccess
({
content
:
messageType
+
Messages
.
deleteSuccessMessage
content
:
messageType
+
Messages
.
getAbbreviationMsg
(
false
,
'deleteSuccessMessage'
)
});
});
that
.
ui
.
termSearchTree
.
jstree
(
true
).
refresh
();
that
.
ui
.
termSearchTree
.
jstree
(
true
).
refresh
();
var
params
=
{
var
params
=
{
...
...
This diff is collapsed.
Click to expand it.
dashboardv3/public/js/views/tag/TagLayoutView.js
View file @
10a11053
...
@@ -527,7 +527,7 @@ define([
...
@@ -527,7 +527,7 @@ define([
that
.
collection
.
fullCollection
.
add
(
classificationDefs
);
that
.
collection
.
fullCollection
.
add
(
classificationDefs
);
that
.
setUrl
(
"#!/tag/tagAttribute/"
+
ref
.
ui
.
tagName
.
val
(),
true
);
that
.
setUrl
(
"#!/tag/tagAttribute/"
+
ref
.
ui
.
tagName
.
val
(),
true
);
Utils
.
notifySuccess
({
Utils
.
notifySuccess
({
content
:
"Classification "
+
that
.
name
+
Messages
.
addSuccessMessage
content
:
"Classification "
+
that
.
name
+
Messages
.
getAbbreviationMsg
(
false
,
'addSuccessMessage'
)
});
});
modal
.
trigger
(
"cancel"
);
modal
.
trigger
(
"cancel"
);
that
.
typeHeaders
.
fetch
({
reset
:
true
});
that
.
typeHeaders
.
fetch
({
reset
:
true
});
...
@@ -616,7 +616,7 @@ define([
...
@@ -616,7 +616,7 @@ define([
typeName
:
that
.
tag
,
typeName
:
that
.
tag
,
success
:
function
()
{
success
:
function
()
{
Utils
.
notifySuccess
({
Utils
.
notifySuccess
({
content
:
"Classification "
+
that
.
tag
+
Messages
.
deleteSuccessMessage
content
:
"Classification "
+
that
.
tag
+
Messages
.
getAbbreviationMsg
(
false
,
'deleteSuccessMessage'
)
});
});
// if deleted tag is prviously searched then remove that tag url from save state of tab.
// if deleted tag is prviously searched then remove that tag url from save state of tab.
var
searchUrl
=
Globals
.
saveApplicationState
.
tabState
.
searchUrl
;
var
searchUrl
=
Globals
.
saveApplicationState
.
tabState
.
searchUrl
;
...
...
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