lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-22 03:37:25 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Avoiding details page if there are no features to enable.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Andre Rodrigues
2011-02-25 14:34:19 -08:00
parent 92f39e9396
commit 39bb7a3357
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs
View File

@@ -256,12 +256,16 @@ namespace Orchard.Packaging.Controllers {
FeatureDescriptor = featureDescriptor FeatureDescriptor = featureDescriptor
}).ToList(); }).ToList();
if (features.Count > 0) {
return View("InstallModule", new PackagingInstallViewModel { return View("InstallModule", new PackagingInstallViewModel {
Features = features, Features = features,
ExtensionDescriptor = extensionDescriptor ExtensionDescriptor = extensionDescriptor
}); });
} }
return InstallPOST(packageId, version, sourceId, redirectTo);
}
[HttpPost, ActionName("InstallModule")] [HttpPost, ActionName("InstallModule")]
public ActionResult InstallModulePOST(PackagingInstallViewModel packagingInstallViewModel, string packageId, string version, int sourceId, string redirectTo) { public ActionResult InstallModulePOST(PackagingInstallViewModel packagingInstallViewModel, string packageId, string version, int sourceId, string redirectTo) {
if (_shellSettings.Name != ShellSettings.DefaultName || !Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to add sources"))) if (_shellSettings.Name != ShellSettings.DefaultName || !Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to add sources")))

2
src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/InstallModule.cshtml
View File

@@ -12,7 +12,6 @@
@using (Html.BeginFormAntiForgeryPost(Url.Action("InstallModule", "Gallery", new { packageId = Request.QueryString["packageId"], version = Request.QueryString["version"], sourceId = Request.QueryString["sourceId"], redirectTo = Request.QueryString["redirectTo"] }))) { @using (Html.BeginFormAntiForgeryPost(Url.Action("InstallModule", "Gallery", new { packageId = Request.QueryString["packageId"], version = Request.QueryString["version"], sourceId = Request.QueryString["sourceId"], redirectTo = Request.QueryString["redirectTo"] }))) {
<h3>@T("Pick the features you want enabled during install").ToString()</h3> <h3>@T("Pick the features you want enabled during install").ToString()</h3>
if (Model.Features.Count > 0) {
<fieldset> <fieldset>
@{ var index = 0; } @{ var index = 0; }
@foreach (PackagingInstallFeatureViewModel feature in Model.Features) { @foreach (PackagingInstallFeatureViewModel feature in Model.Features) {
@@ -27,7 +26,6 @@
</div> </div>
} }
</fieldset> </fieldset>
}
<button class="primaryAction" type="submit">@T("Install")</button> <button class="primaryAction" type="submit">@T("Install")</button>
} }