Skip to content

Commit

Permalink
Merge branch 'master' into Enhancement/PriorityFeatureTracking
Browse files Browse the repository at this point in the history
  • Loading branch information
IamRanjeetSingh authored Sep 16, 2024
2 parents a978da1 + 976764c commit c4abd06
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 6 deletions.
10 changes: 6 additions & 4 deletions Ginger/Ginger/Actions/UserControls/UCFlowControlAction.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -267,17 +267,19 @@ private void SetActionValueComboData()
{
if (mActParentActivity != null)
{
foreach (Act a in mActParentActivity.Acts)
foreach (Act a in mActParentActivity.Acts.Cast<Act>())
{
//avoid current Action
if (App.MainWindow.SelectedSolutionTab == MainWindow.eSolutionTabType.BusinessFlows && mAction == a)//TODO: do better condition
{
continue;
}

ComboEnumItem CEI = new ComboEnumItem();
CEI.Value = a.Guid + FC.GUID_NAME_SEPERATOR + a.Description;//adding also name as second option search to be used when pulling the actions from Shared Repository
CEI.text = a.Description;
ComboEnumItem CEI = new ComboEnumItem
{
Value = a.Guid + FC.GUID_NAME_SEPERATOR + a.Description,//adding also name as second option search to be used when pulling the actions from Shared Repository
text = a.Description
};
ActionValueComboBox.Items.Add(CEI);

if (ActionValueComboBox.SelectedItem == null ||
Expand Down
2 changes: 1 addition & 1 deletion Ginger/GingerCoreCommon/EnvironmentLib/EnvApplication.cs
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ public override eImageType ItemImageType
{
return Platform switch
{
ePlatformType.NA => eImageType.Empty,
ePlatformType.NA => eImageType.Question,
ePlatformType.Web => eImageType.Globe,
ePlatformType.WebServices => eImageType.Exchange,
ePlatformType.Java => eImageType.Java,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public static eImageType GetPlatformImage(ePlatformType platformType = ePlatform
switch (platformType)
{
case ePlatformType.NA:
return eImageType.Empty;
return eImageType.Question;
case ePlatformType.Web:
return eImageType.Globe;
case ePlatformType.WebServices:
Expand Down
22 changes: 22 additions & 0 deletions Ginger/GingerCoreCommon/Repository/RepositoryItemBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1532,6 +1532,28 @@ public bool Publish
}
}

bool mAIGenerated = false;

/// <summary>
/// Gets or sets a value indicating whether the item is AI generated.
/// </summary>
[IsSerializedForLocalRepository(DefaultValue: false)]
public bool AIGenerated
{
get
{
return mAIGenerated;
}
set
{
if (mAIGenerated != value)
{
mAIGenerated = value;
OnPropertyChanged(nameof(AIGenerated));
}
}
}

public Guid ExecutionParentGuid { get; set; } = Guid.Empty;

}
Expand Down

0 comments on commit c4abd06

Please sign in to comment.