lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Suha Can
2010-12-08 18:58:32 -08:00
parent 429fabd93c b7790d3a60
commit e5565d5169
7 changed files with 84 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml
View File

@@ -25,7 +25,7 @@
}
//temporarily "disable" actions on core features
var showActions = categoryName.ToString() != "Core";
bool showActions;
<li class="@categoryClassName">
<h2>@categoryName</h2>
<ul>@{
@@ -46,9 +46,7 @@
select (from f in Model.Features where f.Descriptor.Id == d select f).SingleOrDefault()).Where(f => f != null).OrderBy(f => f.Descriptor.Name);
var missingDependencies = feature.Descriptor.Dependencies
.Where(d => !Model.Features.Any(f => f.Descriptor.Id == d));
if (showActions) {
showActions = missingDependencies.Count() == 0;
}
showActions = categoryName.ToString() != "Core" && missingDependencies.Count() == 0;
<li class="@featureClassName" id="@featureId" title="@T("{0} is {1}", Html.AttributeEncode(featureName), featureState)">
<div class="summary">
<div class="properties">

5
src/Orchard.Web/Web.config
View File

@@ -16,7 +16,7 @@
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" requirePermission="false" />
</configSections>
<appSettings>
<add key="webpages:Enabled" value="false" />
<add key="log4net.Config" value="Config\log4net.config" />
@@ -143,7 +143,8 @@
<probing privatePath="App_Data/Dependencies"/>
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="2.0.0.0" newVersion="3.0.0.0" />
<bindingRedirect oldVersion="1.0.0.0" newVersion="3.0.0.0"/>
<bindingRedirect oldVersion="2.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>