Skip to content

Commit

Permalink
Bugfix/advanced relation defaults (#14178)
Browse files Browse the repository at this point in the history
* change advanced relation store model

* support more types

* remove testing stuff

* fix tolowercase call on possible null

* allow null booleans

* change instatiation type

* Update bundles/AdminBundle/Resources/public/js/pimcore/object/tags/advancedManyToManyRelation.js

Co-authored-by: robertSt7 <104770750+robertSt7@users.noreply.github.com>

---------

Co-authored-by: Cameron Jenkins <cameron.jenkins@torqit.ca>
Co-authored-by: cameronfromtorq <105230931+cameronfromtorq@users.noreply.github.com>
Co-authored-by: robertSt7 <104770750+robertSt7@users.noreply.github.com>
  • Loading branch information
4 people committed Jan 31, 2023
1 parent 68f60a3 commit 5e90431
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 14 deletions.
Expand Up @@ -45,19 +45,29 @@ pimcore.object.tags.advancedManyToManyObjectRelation = Class.create(pimcore.obje
var visibleFields = Ext.isString(this.fieldConfig.visibleFields) ? this.fieldConfig.visibleFields.split(",") : [];
this.visibleFields = visibleFields;

fields.push("id");
fields.push("index");
fields.push("inheritedFields");
fields.push("metadata");
fields.push({name: "id"});
fields.push({name: "index"});
fields.push({name: "inheritedFields"});
fields.push({name: "metadata"});

var i;

for (i = 0; i < visibleFields.length; i++) {
fields.push(visibleFields[i]);
fields.push({name: visibleFields[i]});
}

for (i = 0; i < this.fieldConfig.columns.length; i++) {
fields.push(this.fieldConfig.columns[i].key);
let defaultValue = null;
switch(this.fieldConfig.columns[i].type.toLowerCase()){
case "bool":
defaultValue = this.fieldConfig.columns[i].value ? (this.fieldConfig.columns[i].value).toLowerCase() == "true" : null;
break;
case "text":
case "number":
defaultValue = this.fieldConfig.columns[i].value;
break;
}
fields.push({name: this.fieldConfig.columns[i].key, defaultValue: defaultValue});
}

var modelName = 'ObjectsMultipleRelations';
Expand Down
Expand Up @@ -40,20 +40,31 @@ pimcore.object.tags.advancedManyToManyRelation = Class.create(pimcore.object.tag

var fields = [];

fields.push("id");
fields.push("path");
fields.push("inheritedFields");
fields.push("metadata");
fields.push("type");
fields.push("subtype");
fields.push({name: "id"});
fields.push({name:"path"});
fields.push({name:"inheritedFields"});
fields.push({name:"metadata"});
fields.push({name:"type"});
fields.push({name:"subtype"});

var i;

for (i = 0; i < this.fieldConfig.columns.length; i++) {
fields.push(this.fieldConfig.columns[i].key);
let defaultValue = null;
switch(this.fieldConfig.columns[i].type.toLowerCase()){
case "bool":
case "columnbool":
defaultValue = this.fieldConfig.columns[i].value ? (this.fieldConfig.columns[i].value).toLowerCase() == "true" : null;
break;
case "text":
case "number":
defaultValue = this.fieldConfig.columns[i].value;
break;
}
fields.push({name: this.fieldConfig.columns[i].key, defaultValue: defaultValue});
}

fields.push("rowId");
fields.push({name: "rowId"});

var modelName = 'ObjectsMultihrefMetadataEntry';
if (!Ext.ClassManager.isCreated(modelName)) {
Expand Down

0 comments on commit 5e90431

Please sign in to comment.