Commit bd7f5eec by kevalbhatt Committed by Madhan Neethiraj

ATLAS-3155: UI - IE-11 - Name entry not clickable (#2)

parent fcca791b
......@@ -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">
......
......@@ -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>&nbsp;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">
......
......@@ -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');
......
......@@ -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()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment