From b43b07edc4dad98f96412100fed97d9aa26011c5 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 3 Jan 2023 02:00:09 +0000 Subject: [PATCH] --- putty-ssh-uri-handler-powershell.reg | Bin 0 -> 1064 bytes server/biz/GlobalBizSettingsBiz.cs | 1 + server/models/Purchase.cs | 2 +- server/models/SubscriptionServer.cs | 1 + server/util/AySchema.cs | 6 +++++- 5 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 putty-ssh-uri-handler-powershell.reg diff --git a/putty-ssh-uri-handler-powershell.reg b/putty-ssh-uri-handler-powershell.reg new file mode 100644 index 0000000000000000000000000000000000000000..eb0414cdef8b3779f188e5c1de5986e15e7ac4a0 GIT binary patch literal 1064 zcmb`GZA$_{6ot>{p#QK)rhdrYs1Joum|-L&X+^XlR%U{(vb$yy{q^dZSqC+QFk+b9 zy>sumFK5nvecq^}Ku_vxq)47F)l!?YNU=hVIVs`oVD+&*UE>e&cCZ8NJ>|86xVqDZpbIX-lV&C#|B&hG%x1g@+rWt%D8<5RS_dmIO%UBOqnpRD-H(TUZ4IlGLGbc5; zF*<93+ttp3s4Cr#@Q1`Y4h-^D+g5i8&n{*Ty1`^4w_1UH4G2`BSn)Z?bb>I;h6u#3A$a8Iw8W8QFiNNsp;v%_PWkjhS?HslfT6&)0@$zVdytqX2>(); c.Name = CustomerName; c.Country = jSite["country"].Value(); c.Region = jSite["stateProvince"].Value(); diff --git a/server/models/Purchase.cs b/server/models/Purchase.cs index 6594447..cc2ecdd 100644 --- a/server/models/Purchase.cs +++ b/server/models/Purchase.cs @@ -11,7 +11,7 @@ namespace Sockeye.Models { public long Id { get; set; } public uint Concurrency { get; set; } - public long CustomerId { get; set; } + public long? CustomerId { get; set; } [NotMapped] public string CustomerViz { get; set; } [Required] diff --git a/server/models/SubscriptionServer.cs b/server/models/SubscriptionServer.cs index 58dc1da..811ffa9 100644 --- a/server/models/SubscriptionServer.cs +++ b/server/models/SubscriptionServer.cs @@ -14,6 +14,7 @@ namespace Sockeye.Models [Required] public string Name { get; set; } + public string IPAddress { get; set; } public bool Active { get; set; } public string Notes { get; set; } public DateTime Created { get; set; } diff --git a/server/util/AySchema.cs b/server/util/AySchema.cs index 5f02bed..c72a60a 100644 --- a/server/util/AySchema.cs +++ b/server/util/AySchema.cs @@ -886,7 +886,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE"); await ExecQueryAsync("CREATE TABLE asubscriptionserver (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, active BOOL NOT NULL DEFAULT true, created TIMESTAMPTZ NOT NULL, " - + "name TEXT NOT NULL, notes TEXT, datacenter TEXT NOT NULL, timezone TEXT NOT NULL, dbid TEXT, lastupdated TIMESTAMPTZ, subscriptionexpire TIMESTAMPTZ NOT NULL, " + + "name TEXT NOT NULL, ipaddress TEXT, notes TEXT, datacenter TEXT NOT NULL, timezone TEXT NOT NULL, dbid TEXT, lastupdated TIMESTAMPTZ, subscriptionexpire TIMESTAMPTZ NOT NULL, " + "trial BOOL NOT NULL DEFAULT true, trialcontact TEXT, trialemail TEXT, trialcompany TEXT, operatingsystem TEXT, customersubdomain TEXT, cost DECIMAL(38,18) NOT NULL default 7, " + "wiki TEXT, tags VARCHAR(255) ARRAY, customerid BIGINT REFERENCES acustomer(id) )"); @@ -1033,6 +1033,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE"); await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubscriptionServer', 'Subscription server' FROM atranslation t where t.baselanguage = 'en'"); await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubscriptionServerList', 'Subscription servers' FROM atranslation t where t.baselanguage = 'en'"); await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerName', 'Name' FROM atranslation t where t.baselanguage = 'en'"); + await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerIP', 'IP Address' FROM atranslation t where t.baselanguage = 'en'"); await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerNotes', 'Notes' FROM atranslation t where t.baselanguage = 'en'"); await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerDatacenter', 'Data center' FROM atranslation t where t.baselanguage = 'en'"); await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerTimeZone', 'Time zone' FROM atranslation t where t.baselanguage = 'en'"); @@ -1049,6 +1050,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE"); await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubscriptionServer', 'Subscription server' FROM atranslation t where t.baselanguage = 'es'"); await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubscriptionServerList', 'Subscription servers' FROM atranslation t where t.baselanguage = 'es'"); await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerName', 'Name' FROM atranslation t where t.baselanguage = 'es'"); + await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerIP', 'IP Address' FROM atranslation t where t.baselanguage = 'es'"); await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerNotes', 'Notes' FROM atranslation t where t.baselanguage = 'es'"); await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerDatacenter', 'Data center' FROM atranslation t where t.baselanguage = 'es'"); await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerTimeZone', 'Time zone' FROM atranslation t where t.baselanguage = 'es'"); @@ -1065,6 +1067,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE"); await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubscriptionServer', 'Subscription server' FROM atranslation t where t.baselanguage = 'fr'"); await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubscriptionServerList', 'Subscription servers' FROM atranslation t where t.baselanguage = 'fr'"); await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerName', 'Name' FROM atranslation t where t.baselanguage = 'fr'"); + await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerIP', 'IP Address' FROM atranslation t where t.baselanguage = 'fr'"); await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerNotes', 'Notes' FROM atranslation t where t.baselanguage = 'fr'"); await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerDatacenter', 'Data center' FROM atranslation t where t.baselanguage = 'fr'"); await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerTimeZone', 'Time zone' FROM atranslation t where t.baselanguage = 'fr'"); @@ -1081,6 +1084,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE"); await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubscriptionServer', 'Subscription server' FROM atranslation t where t.baselanguage = 'de'"); await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubscriptionServerList', 'Subscription servers' FROM atranslation t where t.baselanguage = 'de'"); await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerName', 'Name' FROM atranslation t where t.baselanguage = 'de'"); + await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerIP', 'IP Address' FROM atranslation t where t.baselanguage = 'de'"); await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerNotes', 'Notes' FROM atranslation t where t.baselanguage = 'de'"); await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerDatacenter', 'Data center' FROM atranslation t where t.baselanguage = 'de'"); await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerTimeZone', 'Time zone' FROM atranslation t where t.baselanguage = 'de'");