From baa18cab8bf7bec844ebddcce6e36182638d7364 Mon Sep 17 00:00:00 2001 From: pavelbannov Date: Mon, 12 Jun 2023 23:54:10 +0300 Subject: [PATCH] fixed 62955 --- common/ASC.Core.Common/Tenants/TenantQuota.cs | 2 +- web/ASC.Web.Api/ASC.Web.Api.csproj | 2 ++ web/ASC.Web.Api/img/thirdparty.svg | 13 +++++++++++++ .../PublicResources/Resource.Designer.cs | 9 +++++++++ web/ASC.Web.Core/PublicResources/Resource.resx | 7 +++++-- 5 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 web/ASC.Web.Api/img/thirdparty.svg diff --git a/common/ASC.Core.Common/Tenants/TenantQuota.cs b/common/ASC.Core.Common/Tenants/TenantQuota.cs index b883c2ebc0..e63d82b389 100644 --- a/common/ASC.Core.Common/Tenants/TenantQuota.cs +++ b/common/ASC.Core.Common/Tenants/TenantQuota.cs @@ -241,7 +241,7 @@ public class TenantQuota : IMapFrom _autoBackupRestoreFeature = new TenantQuotaFeatureFlag(this) { Name = "restore", Order = 6 }; _oauthFeature = new TenantQuotaFeatureFlag(this) { Name = "oauth", Visible = false }; _contentSearchFeature = new TenantQuotaFeatureFlag(this) { Name = "contentsearch", Visible = false }; - _thirdPartyFeature = new TenantQuotaFeatureFlag(this) { Name = "thirdparty" }; + _thirdPartyFeature = new TenantQuotaFeatureFlag(this) { Name = "thirdparty", Order = 9 }; TenantQuotaFeatures = new List { diff --git a/web/ASC.Web.Api/ASC.Web.Api.csproj b/web/ASC.Web.Api/ASC.Web.Api.csproj index f47e1a1274..6a5951198b 100644 --- a/web/ASC.Web.Api/ASC.Web.Api.csproj +++ b/web/ASC.Web.Api/ASC.Web.Api.csproj @@ -26,6 +26,7 @@ + @@ -35,6 +36,7 @@ + diff --git a/web/ASC.Web.Api/img/thirdparty.svg b/web/ASC.Web.Api/img/thirdparty.svg new file mode 100644 index 0000000000..559a50861f --- /dev/null +++ b/web/ASC.Web.Api/img/thirdparty.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/web/ASC.Web.Core/PublicResources/Resource.Designer.cs b/web/ASC.Web.Core/PublicResources/Resource.Designer.cs index 025d1a1439..3dfae6f262 100644 --- a/web/ASC.Web.Core/PublicResources/Resource.Designer.cs +++ b/web/ASC.Web.Core/PublicResources/Resource.Designer.cs @@ -2697,6 +2697,15 @@ namespace ASC.Web.Core.PublicResources { } } + /// + /// Looks up a localized string similar to Third-party integrations. + /// + public static string TariffsFeature_thirdparty { + get { + return ResourceManager.GetString("TariffsFeature_thirdparty", resourceCulture); + } + } + /// /// Looks up a localized string similar to {0} storage space. /// diff --git a/web/ASC.Web.Core/PublicResources/Resource.resx b/web/ASC.Web.Core/PublicResources/Resource.resx index 959592c8a3..32b54cea37 100644 --- a/web/ASC.Web.Core/PublicResources/Resource.resx +++ b/web/ASC.Web.Core/PublicResources/Resource.resx @@ -53,10 +53,10 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=7.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=7.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Validation code field cannot be empty @@ -988,4 +988,7 @@ What's New + + Third-party integrations + \ No newline at end of file