mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-15 19:54:57 +08:00
Merge
--HG-- branch : dev
This commit is contained in:
@@ -9,6 +9,5 @@
|
|||||||
public enum VersionHistoryOptions {
|
public enum VersionHistoryOptions {
|
||||||
Published,
|
Published,
|
||||||
Draft,
|
Draft,
|
||||||
AllVersions
|
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -165,9 +165,6 @@ namespace Orchard.ImportExport.Services {
|
|||||||
if (versionHistoryOptions.HasFlag(VersionHistoryOptions.Draft)) {
|
if (versionHistoryOptions.HasFlag(VersionHistoryOptions.Draft)) {
|
||||||
return VersionOptions.Draft;
|
return VersionOptions.Draft;
|
||||||
}
|
}
|
||||||
if (versionHistoryOptions.HasFlag(VersionHistoryOptions.AllVersions)) {
|
|
||||||
return VersionOptions.AllVersions;
|
|
||||||
}
|
|
||||||
return VersionOptions.Published;
|
return VersionOptions.Published;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -37,11 +37,7 @@
|
|||||||
<div>
|
<div>
|
||||||
@Html.RadioButtonFor(m => m.DataImportChoice, "Draft", new { id = "Draft" })
|
@Html.RadioButtonFor(m => m.DataImportChoice, "Draft", new { id = "Draft" })
|
||||||
<label for="@Html.FieldIdFor(m => m.DataImportChoice)" class="forcheckbox">@T("Only Drafts")</label>
|
<label for="@Html.FieldIdFor(m => m.DataImportChoice)" class="forcheckbox">@T("Only Drafts")</label>
|
||||||
</div>
|
</div><br />
|
||||||
<div>
|
|
||||||
@Html.RadioButtonFor(m => m.DataImportChoice, "AllVersions", new { id = "AllVersions" })
|
|
||||||
<label for="@Html.FieldIdFor(m => m.DataImportChoice)" class="forcheckbox">@T("All Versions")</label>
|
|
||||||
</div><br />
|
|
||||||
<div>
|
<div>
|
||||||
@Html.EditorFor(m => m.SiteSettings)
|
@Html.EditorFor(m => m.SiteSettings)
|
||||||
<label class="forcheckbox" for="@Html.FieldIdFor( m => m.SiteSettings)">@T("Site Settings")</label><br />
|
<label class="forcheckbox" for="@Html.FieldIdFor( m => m.SiteSettings)">@T("Site Settings")</label><br />
|
||||||
|
Reference in New Issue
Block a user