Skip to content

Commit

Permalink
Fix bug in PCF where statuscode is not returned as OptionSet data type
Browse files Browse the repository at this point in the history
  • Loading branch information
MscrmTools committed Jul 1, 2019
1 parent f500f4f commit 88df6a9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion NNCheckboxes/NNCheckboxes/ControlManifest.Input.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<manifest>
<control namespace="MscrmTools" constructor="NNCheckboxes" version="1.0.8" display-name-key="NNCheckboxes_Display_Key" description-key="NNCheckboxes_Desc_Key" control-type="standard" preview-image="logo.png">
<control namespace="MscrmTools" constructor="NNCheckboxes" version="1.0.10" display-name-key="NNCheckboxes_Display_Key" description-key="NNCheckboxes_Desc_Key" control-type="standard" preview-image="logo.png">
<data-set name="nnRelationshipDataSet" display-name-key="nnRelationshipDataSet_Display_Key">
<property-set name="displayAttribute" display-name-key="targetEntity_Display_Key" description-key="targetEntity_Desc_Key" of-type="SingleLine.Text" usage="bound" required="true" />
<property-set name="backgroundColorAttribute" display-name-key="backgroundColorAttribute_Display_Key" description-key="backgroundColorAttribute_Desc_Key" of-type-group="colorTypes" usage="bound" required="false" />
Expand Down
6 changes: 3 additions & 3 deletions NNCheckboxes/NNCheckboxes/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export class NNCheckboxes implements ComponentFramework.StandardControl<IInputs,
else if(column.alias === "backgroundColorAttribute"){
this._backgroundColorAttributeName = column.name;

if(column.dataType === "OptionSet"){
if(column.dataType === "OptionSet" || column.dataType === "" && column.name === "statuscode"){
if(!this._colors || !this._colors[column.name]){
await this.GetOptionSetColors(column.name);
}
Expand All @@ -115,7 +115,7 @@ export class NNCheckboxes implements ComponentFramework.StandardControl<IInputs,
else if(column.alias === "foreColorAttribute"){
this._foreColorAttributeName = column.name;

if(column.dataType === "OptionSet"){
if(column.dataType === "OptionSet" || column.dataType === "" && column.name === "statuscode"){
if(!this._colors || !this._colors[column.name]){
await this.GetOptionSetColors(column.name);
}
Expand All @@ -125,7 +125,7 @@ export class NNCheckboxes implements ComponentFramework.StandardControl<IInputs,
}
else if(column.alias === "categoryAttribute"){
this._categoryAttributeName = column.name;
this._categoryUseDisplayName = column.dataType === "Lookup.Simple" || column.dataType === "OptionSet" || column.dataType === "TwoOptions";
this._categoryUseDisplayName = column.dataType === "Lookup.Simple" || column.dataType === "OptionSet" || column.dataType === "TwoOptions" || column.dataType === "" && column.name === "statuscode";
}
}

Expand Down

0 comments on commit 88df6a9

Please sign in to comment.