will it blend?

Squashed commit of the following:

commit 3d3baddd23
Author: Henry <akhenry@gmail.com>
Date:   Thu Feb 2 15:08:26 2017 -0800

    [Tables] Do not persist column configuration for non-editable objects
This commit is contained in:
Pete Richards
2017-02-15 16:08:56 -08:00
parent 26a0aed159
commit 3b01b9ee51
2 changed files with 12 additions and 2 deletions

View File

@@ -172,7 +172,9 @@ define(
});
//Synchronize column configuration with model
if (configChanged(configuration, defaultConfig)) {
if (this.domainObject.hasCapability('editor') &&
this.domainObject.getCapability('editor').isEditContextRoot() &&
configChanged(configuration, defaultConfig)) {
this.saveColumnConfiguration(configuration);
}

View File

@@ -36,10 +36,18 @@ define(
beforeEach(function () {
mockDomainObject = jasmine.createSpyObj('domainObject',
['getModel', 'useCapability', 'getCapability']
['getModel', 'useCapability', 'getCapability', 'hasCapability']
);
mockModel = {};
mockDomainObject.getModel.andReturn(mockModel);
mockDomainObject.getCapability.andCallFake(function (name) {
return name === 'editor' && {
isEditContextRoot: function () {
return true;
}
};
});
mockTelemetryFormatter = jasmine.createSpyObj('telemetryFormatter',
[
'format'