Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'oqtane/dev' into dev

Browse Source
This commit is contained in:
Leigh Pointer
2023-07-17 11:01:10 +02:00
parent 4071b285ce 39adcde16d
commit 6b16808207
5 changed files with 117 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Oqtane.Client/Modules/Admin/Languages/Index.razor
View File

@ -147,7 +147,15 @@ else
try try
{ {
_package = await PackageService.GetPackageAsync(Constants.PackageId + "." + code, version); _package = await PackageService.GetPackageAsync(Constants.PackageId + "." + code, version);
if (_package != null)
{
StateHasChanged(); StateHasChanged();
}
else
{
await logger.LogError("Error Getting Package {PackageId} {Version}", Constants.PackageId + "." + code, Constants.Version);
AddModuleMessage(Localizer["Error.Translation.Download"], MessageType.Error);
}
} }
catch (Exception ex) catch (Exception ex)
{ {

7
Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
View File

@ -217,9 +217,14 @@
_packagelicense = package.License.Replace("\n", "<br />"); _packagelicense = package.License.Replace("\n", "<br />");
} }
_packageversion = package.Version; _packageversion = package.Version;
}
StateHasChanged(); StateHasChanged();
} }
else
{
await logger.LogError("Error Getting Package {PackageId} {Version}", packageid, version);
AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error);
}
}
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", packageid, version); await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", packageid, version);

8
Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
View File

@ -366,7 +366,15 @@
try try
{ {
_package = await PackageService.GetPackageAsync(packagename, version); _package = await PackageService.GetPackageAsync(packagename, version);
if (_package != null)
{
StateHasChanged(); StateHasChanged();
}
else
{
await logger.LogError("Error Getting Package {PackageId} {Version}", packagename, version);
AddModuleMessage(Localizer["Error.Translation.Download"], MessageType.Error);
}
} }
catch (Exception ex) catch (Exception ex)
{ {

7
Oqtane.Client/Modules/Admin/Themes/Add.razor
View File

@ -217,9 +217,14 @@
} }
_packageid = package.PackageId; _packageid = package.PackageId;
_version = package.Version; _version = package.Version;
}
StateHasChanged(); StateHasChanged();
} }
else
{
await logger.LogError("Error Getting Package {PackageId} {Version}", packageid, version);
AddModuleMessage(Localizer["Error.Theme.Download"], MessageType.Error);
}
}
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", packageid, version); await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", packageid, version);

16
Oqtane.Server/Controllers/PackageController.cs
View File

@ -45,15 +45,6 @@ namespace Oqtane.Controllers
client.DefaultRequestHeaders.Add("Referer", HttpContext.Request.Scheme + "://" + HttpContext.Request.Host.Value); client.DefaultRequestHeaders.Add("Referer", HttpContext.Request.Scheme + "://" + HttpContext.Request.Host.Value);
client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue(Constants.PackageId, Constants.Version)); client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue(Constants.PackageId, Constants.Version));
packages = await GetJson<List<Package>>(client, Constants.PackageRegistryUrl + $"/api/registry/packages/?id={_configManager.GetInstallationId()}&type={type.ToLower()}&version={Constants.Version}&search={search}&price={price}&package={package}&sort={sort}"); packages = await GetJson<List<Package>>(client, Constants.PackageRegistryUrl + $"/api/registry/packages/?id={_configManager.GetInstallationId()}&type={type.ToLower()}&version={Constants.Version}&search={search}&price={price}&package={package}&sort={sort}");
if (packages != null)
{
var installationid = _configManager.GetInstallationId();
foreach (var _package in packages)
{
_package.PaymentUrl = _package.PaymentUrl.Replace("{InstallationId}", installationid);
_package.SupportUrl = _package.SupportUrl.Replace("{InstallationId}", installationid);
}
}
} }
} }
return packages; return packages;
@ -73,13 +64,6 @@ namespace Oqtane.Controllers
client.DefaultRequestHeaders.Add("Referer", HttpContext.Request.Scheme + "://" + HttpContext.Request.Host.Value); client.DefaultRequestHeaders.Add("Referer", HttpContext.Request.Scheme + "://" + HttpContext.Request.Host.Value);
client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue(Constants.PackageId, Constants.Version)); client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue(Constants.PackageId, Constants.Version));
package = await GetJson<Package>(client, Constants.PackageRegistryUrl + $"/api/registry/package/?id={_configManager.GetInstallationId()}&package={packageid}&version={version}&download={download}"); package = await GetJson<Package>(client, Constants.PackageRegistryUrl + $"/api/registry/package/?id={_configManager.GetInstallationId()}&package={packageid}&version={version}&download={download}");
if (package != null)
{
var installationid = _configManager.GetInstallationId();
package.PaymentUrl = package.PaymentUrl.Replace("{InstallationId}", installationid);
package.SupportUrl = package.SupportUrl.Replace("{InstallationId}", installationid);
}
} }
if (package != null) if (package != null)