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
fa712590
Commit
fa712590
authored
7 years ago
by
kevalbhatt
Committed by
Madhan Neethiraj
7 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-2676 : UI fix to address basic-search handling of term input in IE
Signed-off-by:
Madhan Neethiraj
<
madhan@apache.org
>
parent
f756e9b3
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
23 additions
and
11 deletions
+23
-11
glossary.scss
dashboardv2/public/css/scss/glossary.scss
+1
-1
atlasLogin.js
dashboardv2/public/js/modules/atlasLogin.js
+6
-1
GlossaryLayoutView_tmpl.html
...public/js/templates/glossary/GlossaryLayoutView_tmpl.html
+2
-2
CommonViewFunction.js
dashboardv2/public/js/utils/CommonViewFunction.js
+0
-1
Overrides.js
dashboardv2/public/js/utils/Overrides.js
+7
-0
DetailPageLayoutView.js
...ardv2/public/js/views/detail_page/DetailPageLayoutView.js
+1
-1
GlossaryLayoutView.js
dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
+2
-2
SearchLayoutView.js
dashboardv2/public/js/views/search/SearchLayoutView.js
+3
-2
SearchResultLayoutView.js
dashboardv2/public/js/views/search/SearchResultLayoutView.js
+1
-1
No files found.
dashboardv2/public/css/scss/glossary.scss
View file @
fa712590
...
...
@@ -27,7 +27,7 @@
overflow
:
hidden
;
text-overflow
:
ellipsis
;
}
.jstree-children
{
.jstree-children
.jstree-children
>
li
>
a
{
max-width
:
500px
;
}
.jstree-clicked
,
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/modules/atlasLogin.js
View file @
fa712590
...
...
@@ -18,7 +18,7 @@
//Define indexOf for IE
if
(
!
Array
.
indexOf
)
{
if
(
!
Array
.
prototype
.
indexOf
)
{
Array
.
prototype
.
indexOf
=
function
(
obj
,
start
)
{
for
(
var
i
=
(
start
||
0
);
i
<
this
.
length
;
i
++
)
{
if
(
this
[
i
]
==
obj
)
{
...
...
@@ -29,6 +29,11 @@ if (!Array.indexOf) {
};
}
if
(
!
String
.
prototype
.
startsWith
)
{
String
.
prototype
.
startsWith
=
function
(
str
,
matchStr
)
{
return
str
.
lastIndexOf
(
matchStr
,
0
)
===
0
}
}
function
doLogin
()
{
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/templates/glossary/GlossaryLayoutView_tmpl.html
View file @
fa712590
...
...
@@ -38,14 +38,14 @@
<div>
<input
type=
"text"
class=
"form-control"
data-id=
"searchTerm"
placeholder=
"{{#if isAssignView}}Search Term{{else}}Search Glossary, Term{{/if}}"
>
</div>
<div
data-id=
"termTree"
style=
"margin-top: 5px;
overflow-x: auto
;"
>
<div
data-id=
"termTree"
style=
"margin-top: 5px;
padding-bottom: 25px;overflow-x: auto;overflow-y:hidden
;"
>
</div>
</div>
<div
class=
"col-sm-12 no-padding category-view"
style=
"display: none;"
>
<div>
<input
type=
"text"
class=
"form-control"
data-id=
"searchCategory"
placeholder=
"{{#if isAssignView}}Search Catalog{{else}}Search Glossary, Category{{/if}}"
>
</div>
<div
data-id=
"categoryTree"
style=
"margin-top: 5px;
overflow-x: auto
;"
>
<div
data-id=
"categoryTree"
style=
"margin-top: 5px;
padding-bottom: 25px;overflow-x: auto;overflow-y: hidden
;"
>
</div>
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/utils/CommonViewFunction.js
View file @
fa712590
...
...
@@ -763,7 +763,6 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
}
}
CommonViewFunction
.
addRestCsrfCustomHeader
=
function
(
xhr
,
settings
)
{
// if (settings.url == null || !settings.url.startsWith('/webhdfs/')) {
if
(
settings
.
url
==
null
)
{
return
;
}
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/utils/Overrides.js
View file @
fa712590
...
...
@@ -48,6 +48,13 @@ define(['require', 'utils/Utils', 'marionette', 'backgrid', 'asBreadcrumbs', 'jq
return
false
;
}
},
startsWith
:
function
(
str
,
matchStr
)
{
if
(
str
&&
matchStr
&&
_
.
isString
(
str
)
&&
_
.
isString
(
matchStr
))
{
return
str
.
lastIndexOf
(
matchStr
,
0
)
===
0
}
else
{
return
;
}
},
isUndefinedNull
:
function
(
val
)
{
if
(
_
.
isUndefined
(
val
)
||
_
.
isNull
(
val
))
{
return
true
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
View file @
fa712590
...
...
@@ -126,7 +126,7 @@ define(['require',
this
.
entityObject
=
this
.
collection
.
first
().
toJSON
();
var
collectionJSON
=
this
.
entityObject
.
entity
;
if
(
collectionJSON
&&
collectionJSON
.
typeName
.
startsWith
(
"AtlasGlossary"
))
{
if
(
collectionJSON
&&
_
.
startsWith
(
collectionJSON
.
typeName
,
"AtlasGlossary"
))
{
this
.
$
(
".termBox"
).
hide
();
}
// MergerRefEntity.
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
View file @
fa712590
...
...
@@ -268,7 +268,7 @@ define(['require',
if
(
index
==
0
&&
selectedItem
.
guid
==
objGuid
)
{
that
.
glossary
.
selectedItem
=
selectedItem
;
that
.
query
[
that
.
viewType
].
model
=
selectedItem
.
model
;
that
.
query
[
that
.
viewType
].
type
=
selectedItem
.
gT
ype
;
that
.
query
[
that
.
viewType
].
type
=
selectedItem
.
t
ype
;
return
{
'opened'
:
true
,
'selected'
:
true
...
...
@@ -279,7 +279,7 @@ define(['require',
that
.
query
[
that
.
viewType
].
isNodeNotFoundAtLoad
=
false
;
that
.
glossary
.
selectedItem
=
node
that
.
query
[
that
.
viewType
].
model
=
node
.
model
;
that
.
query
[
that
.
viewType
].
type
=
node
.
gT
ype
;
that
.
query
[
that
.
viewType
].
type
=
node
.
t
ype
;
return
{
'opened'
:
true
,
'selected'
:
true
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/search/SearchLayoutView.js
View file @
fa712590
...
...
@@ -549,8 +549,9 @@ define(['require',
this
.
ui
.
tagLov
.
trigger
(
"change"
,
{
'manual'
:
true
});
}
}
this
.
ui
.
termLov
.
append
(
'<option value="'
+
this
.
value
.
term
+
'" selected="selected">'
+
this
.
value
.
term
+
'</option>'
);
if
(
this
.
value
.
term
)
{
this
.
ui
.
termLov
.
append
(
'<option value="'
+
this
.
value
.
term
+
'" selected="selected">'
+
this
.
value
.
term
+
'</option>'
);
}
if
(
this
.
ui
.
termLov
.
data
(
'select2'
))
{
if
(
this
.
ui
.
termLov
.
val
()
!==
this
.
value
.
term
)
{
this
.
value
.
term
=
null
;
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/search/SearchResultLayoutView.js
View file @
fa712590
...
...
@@ -854,7 +854,7 @@ define(['require',
formatter
:
_
.
extend
({},
Backgrid
.
CellFormatter
.
prototype
,
{
fromRaw
:
function
(
rawValue
,
model
)
{
var
obj
=
model
.
toJSON
();
if
(
obj
.
typeName
&&
!
(
obj
.
typeName
.
startsWith
(
"AtlasGlossary"
)))
{
if
(
obj
.
typeName
&&
!
(
_
.
startsWith
(
obj
.
typeName
,
"AtlasGlossary"
)))
{
if
(
obj
.
status
&&
Enums
.
entityStateReadOnly
[
obj
.
status
])
{
return
'<div class="readOnly">'
+
CommonViewFunction
.
termForTable
(
obj
);
+
'</div>'
;
}
else
{
...
...
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