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
bd7f5eec
Commit
bd7f5eec
authored
6 years ago
by
kevalbhatt
Committed by
Madhan Neethiraj
6 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-3155: UI - IE-11 - Name entry not clickable (#2)
Signed-off-by:
Madhan Neethiraj
<
madhan@apache.org
>
parent
fcca791b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
15 deletions
+13
-15
CreateEntityLayoutView_tmpl.html
...blic/js/templates/entity/CreateEntityLayoutView_tmpl.html
+1
-1
SearchResultLayoutView_tmpl.html
...blic/js/templates/search/SearchResultLayoutView_tmpl.html
+5
-5
CreateEntityLayoutView.js
dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
+6
-8
AtlasSecurityConfig.java
...va/org/apache/atlas/web/security/AtlasSecurityConfig.java
+1
-1
No files found.
dashboardv2/public/js/templates/entity/CreateEntityLayoutView_tmpl.html
View file @
bd7f5eec
...
...
@@ -27,7 +27,7 @@
<select
class=
"form-control col-sm-6 row-margin-bottom"
data-id=
"entityList"
></select>
</div>
{{/if}}
<div
class=
"col-sm-4"
>
<div
class=
"col-sm-4
toggleRequiredSwitch
"
>
<span
class=
"pull-left"
>
Required
</span>
<label
class=
"switch pull-left"
>
<input
type=
"checkbox"
class=
"switch-input"
name=
"toggleRequired"
value=
"text"
>
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
View file @
bd7f5eec
...
...
@@ -25,10 +25,13 @@
<div
class=
"searchTable"
>
<div
class=
"{{#unless isGlossaryView}}row well{{/unless}}"
style=
"padding-top: 0px;"
>
<div
class=
"row form-group pagination-box filter-box"
style=
"display: none;"
>
<div
class=
"col-sm-
4
"
>
<div
class=
"col-sm-
3
"
>
<span
class=
"labelShowRecord pull-left"
data-id=
"pageRecordText"
>
</span>
</div>
<div
class=
"col-sm-8 inline-content-fr no-padding-left"
>
<div
class=
"col-sm-9 inline-content-fr no-padding-left"
>
<div
class=
"inline"
>
<a
href=
"javascript:void(0)"
class=
" multiSelectTag assignTag btn btn-action btn-sm"
style=
"display:none"
title=
"Assign Classification"
data-id=
"addAssignTag"
><i
class=
"fa fa-plus"
></i>
Classification
</a>
</div>
<div
class=
"inline"
data-id=
"colManager"
></div>
<div
class=
"inline"
data-id=
"containerCheckBox"
style=
"display: none;"
>
<label
class=
"checkbox-inline btn"
for=
"historicalentities"
>
...
...
@@ -47,9 +50,6 @@
<b>
Exclude sub-types
</b></label>
</div>
{{/ifCond}}
<div
class=
"inline"
>
<a
href=
"javascript:void(0)"
class=
" multiSelectTag assignTag btn btn-action btn-sm"
style=
"display:none"
data-id=
"addAssignTag"
><i
class=
"fa fa-plus"
></i>
Assign Tag
</a>
</div>
</div>
</div>
<div
id=
"r_searchResultTableLayoutView"
>
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
View file @
bd7f5eec
...
...
@@ -125,6 +125,7 @@ define(['require',
}
this
.
showLoader
();
this
.
fetchCollections
();
this
.
$
(
'.toggleRequiredSwitch'
).
hide
();
},
bindRequiredField
:
function
()
{
var
that
=
this
;
...
...
@@ -411,6 +412,11 @@ define(['require',
}
})
}
if
(
attributeDefs
.
attributeDefs
.
length
||
attributeDefs
.
relationshipAttributeDefs
.
length
)
{
this
.
$
(
'.toggleRequiredSwitch'
).
show
();
}
else
{
this
.
$
(
'.toggleRequiredSwitch'
).
hide
();
}
//make a function call.
this
.
renderAttribute
({
attributeDefs
:
attributeDefs
...
...
@@ -443,14 +449,6 @@ define(['require',
// For create entity bind keyup for non-required field when all elements are optional
this
.
bindNonRequiredField
();
}
this
.
ui
.
toggleRequired
.
prop
(
'checked'
,
true
);
}
else
{
this
.
ui
.
entityInputData
.
find
(
'fieldset'
).
each
(
function
()
{
// if checkbox is alredy selected then dont hide
if
(
!
$
(
this
).
find
(
'div'
).
hasClass
(
'false'
)
&&
!
that
.
ui
.
toggleRequired
.
is
(
":checked"
))
{
$
(
this
).
hide
();
}
});
}
this
.
$
(
'select[data-type="boolean"]'
).
each
(
function
(
value
,
key
)
{
var
dataKey
=
$
(
key
).
data
(
'key'
);
...
...
This diff is collapsed.
Click to expand it.
webapp/src/main/java/org/apache/atlas/web/security/AtlasSecurityConfig.java
View file @
bd7f5eec
...
...
@@ -128,7 +128,7 @@ public class AtlasSecurityConfig extends WebSecurityConfigurerAdapter {
.
authorizeRequests
().
anyRequest
().
authenticated
()
.
and
()
.
headers
()
.
addHeaderWriter
(
new
StaticHeadersWriter
(
"Content-Security-Policy"
,
"script-src 'self' 'unsafe-inline' 'unsafe-eval'
"
))
.
addHeaderWriter
(
new
StaticHeadersWriter
(
"Content-Security-Policy"
,
"default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval' blob: data:; connect-src 'self'; img-src 'self' blob: data:; style-src 'self' 'unsafe-inline';font-src 'self' data:
"
))
.
addHeaderWriter
(
new
StaticHeadersWriter
(
"Server"
,
"Apache Atlas"
))
.
and
()
.
servletApi
()
...
...
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