[filter bar] Cleanup

This commit is contained in:
Jonathan Budzenski 2015-11-04 10:38:17 -06:00
parent b755082681
commit 647be88cb3

View file

@ -61,9 +61,9 @@ define(function (require) {
$scope.startEditingFilter = function (source) {
return $scope.editingFilter = {
source: source,
type: _.first(_.filter(_.keys(source), function (key) {
type: _.findKey(source, function (val, key) {
return !key.match(privateFilterFieldRegex);
})),
}),
model: convertToEditableFilter(source),
alias: source.meta.alias
};
@ -129,17 +129,9 @@ define(function (require) {
});
function convertToEditableFilter(filter) {
var model = _.cloneDeep(filter);
var filterType;
//Hide private properties
_.each(model, function (value, key) {
if (key.match(privateFilterFieldRegex)) {
delete model[key];
}
return _.omit(_.cloneDeep(filter), function (val, key) {
return key.match(privateFilterFieldRegex);
});
return model;
}
function updateFilters() {