diff --git a/Core/DataObjects/PTMagicData.cs b/Core/DataObjects/PTMagicData.cs index 9aff623..27fe0fd 100644 --- a/Core/DataObjects/PTMagicData.cs +++ b/Core/DataObjects/PTMagicData.cs @@ -166,8 +166,6 @@ namespace Core.Main.DataObjects.PTMagicData public class SingleMarketSetting { public string SettingName { get; set; } - - public string TriggerLogic { get; set; } = "AND"; public string TriggerConnection { get; set; } = "AND"; diff --git a/Monitor/Pages/_get/SettingsGlobalSettings.cshtml b/Monitor/Pages/_get/SettingsGlobalSettings.cshtml index f7f6cfc..cc98576 100644 --- a/Monitor/Pages/_get/SettingsGlobalSettings.cshtml +++ b/Monitor/Pages/_get/SettingsGlobalSettings.cshtml @@ -36,12 +36,7 @@ @if (!Model.GlobalSetting.SettingName.StartsWith("Default", StringComparison.InvariantCultureIgnoreCase)) { <div class="form-group row"> <label class="col-md-4 col-form-label">Trigger Connection <i class="fa fa-info-circle text-muted" data-toggle="tooltip" data-placement="top" title="Define if triggers will be connected by AND or OR"></i></label> - <div class="col-md-8"> - <select name="MarketAnalyzer_GlobalSetting_@(Model.SettingName)|TriggerConnection" class="form-control"> - <option selected="@(Model.GlobalSetting.TriggerConnection.Equals("AND", StringComparison.InvariantCultureIgnoreCase))">AND</option> - <option selected="@(Model.GlobalSetting.TriggerConnection.Equals("OR", StringComparison.InvariantCultureIgnoreCase))">OR</option> - </select> - </div> + <input type="text" name="MarketAnalyzer_GlobalSetting_@(Model.SettingName)|TriggerConnection" class="form-control" value="@Model.GlobalSetting.TriggerConnection" /> </div> <hr />