lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-21 18:49:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Andre Rodrigues
2010-10-14 10:55:01 -07:00
parent 1581886883 6659f12169
commit 5eefacfb10
6 changed files with 120 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Orchard.Tests.Modules/Themes/Services/ThemeServiceTests.cs
View File

@@ -90,6 +90,7 @@ namespace Orchard.Tests.Modules.Themes.Services {
builder.RegisterType<TransactionManager>().As<ITransactionManager>(); builder.RegisterType<TransactionManager>().As<ITransactionManager>();
builder.RegisterType<Notifier>().As<INotifier>(); builder.RegisterType<Notifier>().As<INotifier>();
builder.RegisterType<StubAuthorizer>().As<IAuthorizer>(); builder.RegisterType<StubAuthorizer>().As<IAuthorizer>();
builder.RegisterType<DefaultContentDisplay>().As<IContentDisplay>();
builder.RegisterType(typeof(SettingsFormatter)) builder.RegisterType(typeof(SettingsFormatter))
.As(typeof(IMapper<XElement, SettingsDictionary>)) .As(typeof(IMapper<XElement, SettingsDictionary>))
.As(typeof(IMapper<SettingsDictionary, XElement>)); .As(typeof(IMapper<SettingsDictionary, XElement>));

2
src/Orchard.Tests.Modules/Users/Services/MembershipServiceTests.cs
View File

@@ -83,6 +83,8 @@ namespace Orchard.Tests.Modules.Users.Services {
builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>(); builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
builder.RegisterType<ShapeHelperFactory>().As<IShapeHelperFactory>(); builder.RegisterType<ShapeHelperFactory>().As<IShapeHelperFactory>();
builder.RegisterType<StubExtensionManager>().As<IExtensionManager>(); builder.RegisterType<StubExtensionManager>().As<IExtensionManager>();
builder.RegisterType<DefaultContentDisplay>().As<IContentDisplay>();
_session = _sessionFactory.OpenSession(); _session = _sessionFactory.OpenSession();
builder.RegisterInstance(new TestSessionLocator(_session)).As<ISessionLocator>(); builder.RegisterInstance(new TestSessionLocator(_session)).As<ISessionLocator>();
_container = builder.Build(); _container = builder.Build();

97
src/Orchard.Tests.Modules/Widgets/Services/WidgetsServiceTest.cs
View File

@@ -32,6 +32,19 @@ namespace Orchard.Tests.Modules.Widgets.Services {
private const string ThemeZoneName1 = "sidebar"; private const string ThemeZoneName1 = "sidebar";
private const string ThemeZoneName2 = "alternative"; private const string ThemeZoneName2 = "alternative";
private const string LayerName1 = "Test layer 1";
private const string LayerDescription1 = "Test layer 1";
private const string LayerName2 = "Test layer 2";
private const string LayerDescription2 = "Test layer 2";
private const string WidgetTitle1 = "Test widget 1";
private const string WidgetTitle2 = "Test widget 2";
private const string WidgetTitle3 = "Test widget 3";
private const string Zone1 = "Zone1";
private const string Zone2 = "Zone2";
private const string Position1 = "1";
private const string Position2 = "3";
private const string Position3 = "4";
private IWidgetsService _widgetService; private IWidgetsService _widgetService;
private IContentManager _contentManager; private IContentManager _contentManager;
@@ -85,26 +98,22 @@ namespace Orchard.Tests.Modules.Widgets.Services {
builder.RegisterType<StubWidgetPartHandler>().As<IContentHandler>(); builder.RegisterType<StubWidgetPartHandler>().As<IContentHandler>();
builder.RegisterType<StubLayerPartHandler>().As<IContentHandler>(); builder.RegisterType<StubLayerPartHandler>().As<IContentHandler>();
builder.RegisterType<DefaultContentQuery>().As<IContentQuery>(); builder.RegisterType<DefaultContentQuery>().As<IContentQuery>();
builder.RegisterType<DefaultContentDisplay>().As<IContentDisplay>();
} }
[Test] [Test]
public void GetLayersTest() { public void GetLayersTest() {
const string layerName1 = "Test layer 1";
const string layerDescription1 = "Test layer 1";
const string layerName2 = "Test layer 2";
const string layerDescription2 = "Test layer 2";
IEnumerable<LayerPart> layers = _widgetService.GetLayers(); IEnumerable<LayerPart> layers = _widgetService.GetLayers();
Assert.That(layers.Count(), Is.EqualTo(0)); Assert.That(layers.Count(), Is.EqualTo(0));
LayerPart layerPartFirst = _widgetService.CreateLayer(layerName1, layerDescription1, ""); LayerPart layerPartFirst = _widgetService.CreateLayer(LayerName1, LayerDescription1, "");
_contentManager.Flush(); _contentManager.Flush();
layers = _widgetService.GetLayers(); layers = _widgetService.GetLayers();
Assert.That(layers.Count(), Is.EqualTo(1)); Assert.That(layers.Count(), Is.EqualTo(1));
Assert.That(layers.First().Id, Is.EqualTo(layerPartFirst.Id)); Assert.That(layers.First().Id, Is.EqualTo(layerPartFirst.Id));
_widgetService.CreateLayer(layerName2, layerDescription2, ""); _widgetService.CreateLayer(LayerName2, LayerDescription2, "");
_contentManager.Flush(); _contentManager.Flush();
Assert.That(layers.Count(), Is.EqualTo(1)); Assert.That(layers.Count(), Is.EqualTo(1));
} }
@@ -123,34 +132,27 @@ namespace Orchard.Tests.Modules.Widgets.Services {
[Test] [Test]
public void CreateLayerTest() { public void CreateLayerTest() {
const string layerName = "Test layer 1";
const string layerDescription = "Test layer 1";
IEnumerable<LayerPart> layers = _widgetService.GetLayers(); IEnumerable<LayerPart> layers = _widgetService.GetLayers();
Assert.That(layers.Count(), Is.EqualTo(0), "No layers yet"); Assert.That(layers.Count(), Is.EqualTo(0), "No layers yet");
_widgetService.CreateLayer(layerName, layerDescription, ""); _widgetService.CreateLayer(LayerName1, LayerDescription1, "");
_contentManager.Flush(); _contentManager.Flush();
layers = _widgetService.GetLayers(); layers = _widgetService.GetLayers();
LayerPart layer = layers.First(); LayerPart layer = layers.First();
Assert.That(layer.Record.Name, Is.EqualTo(layerName)); Assert.That(layer.Record.Name, Is.EqualTo(LayerName1));
Assert.That(layer.Record.Description, Is.EqualTo(layerDescription)); Assert.That(layer.Record.Description, Is.EqualTo(LayerDescription1));
} }
[Test] [Test]
public void GetWidgetTest() { public void GetWidgetTest() {
const string layerName = "Test layer 1"; LayerPart layerPart = _widgetService.CreateLayer(LayerName1, LayerDescription1, "");
const string layerDescription = "Test layer 1";
const string widgetTitle = "Test widget 1";
LayerPart layerPart = _widgetService.CreateLayer(layerName, layerDescription, "");
_contentManager.Flush(); _contentManager.Flush();
WidgetPart widgetResult = _widgetService.GetWidget(0); WidgetPart widgetResult = _widgetService.GetWidget(0);
Assert.That(widgetResult, Is.Null); Assert.That(widgetResult, Is.Null);
WidgetPart widgetPart = _widgetService.CreateWidget(layerPart.Id, "HtmlWidget", widgetTitle, "1", ""); WidgetPart widgetPart = _widgetService.CreateWidget(layerPart.Id, "HtmlWidget", WidgetTitle1, "1", "");
Assert.That(widgetPart, Is.Not.Null); Assert.That(widgetPart, Is.Not.Null);
widgetResult = _widgetService.GetWidget(0); widgetResult = _widgetService.GetWidget(0);
@@ -163,18 +165,13 @@ namespace Orchard.Tests.Modules.Widgets.Services {
[Test] [Test]
public void GetWidgetsTest() { public void GetWidgetsTest() {
const string layerName = "Test layer 1"; LayerPart layerPart = _widgetService.CreateLayer(LayerName1, LayerDescription1, "");
const string layerDescription = "Test layer 1";
const string widgetTitle1 = "Test widget 1";
const string widgetTitle2 = "Test widget 2";
LayerPart layerPart = _widgetService.CreateLayer(layerName, layerDescription, "");
_contentManager.Flush(); _contentManager.Flush();
IEnumerable<WidgetPart> widgetResults = _widgetService.GetWidgets(); IEnumerable<WidgetPart> widgetResults = _widgetService.GetWidgets();
Assert.That(widgetResults.Count(), Is.EqualTo(0)); Assert.That(widgetResults.Count(), Is.EqualTo(0));
WidgetPart widgetPart = _widgetService.CreateWidget(layerPart.Id, "HtmlWidget", widgetTitle1, "1", ""); WidgetPart widgetPart = _widgetService.CreateWidget(layerPart.Id, "HtmlWidget", WidgetTitle1, "1", "");
Assert.That(widgetPart, Is.Not.Null); Assert.That(widgetPart, Is.Not.Null);
_contentManager.Flush(); _contentManager.Flush();
@@ -182,7 +179,7 @@ namespace Orchard.Tests.Modules.Widgets.Services {
Assert.That(widgetResults.Count(), Is.EqualTo(1)); Assert.That(widgetResults.Count(), Is.EqualTo(1));
Assert.That(widgetResults.First().Id, Is.EqualTo(widgetPart.Id)); Assert.That(widgetResults.First().Id, Is.EqualTo(widgetPart.Id));
_widgetService.CreateWidget(layerPart.Id, "HtmlWidget", widgetTitle2, "2", ""); _widgetService.CreateWidget(layerPart.Id, "HtmlWidget", WidgetTitle2, "2", "");
_contentManager.Flush(); _contentManager.Flush();
widgetResults = _widgetService.GetWidgets(); widgetResults = _widgetService.GetWidgets();
@@ -191,14 +188,10 @@ namespace Orchard.Tests.Modules.Widgets.Services {
[Test] [Test]
public void CreateWidgetTest() { public void CreateWidgetTest() {
const string layerName = "Test layer 1"; LayerPart layerPart = _widgetService.CreateLayer(LayerName1, LayerDescription1, "");
const string layerDescription = "Test layer 1";
const string widgetTitle = "Test widget 1";
LayerPart layerPart = _widgetService.CreateLayer(layerName, layerDescription, "");
_contentManager.Flush(); _contentManager.Flush();
WidgetPart widgetPart = _widgetService.CreateWidget(layerPart.Id, "HtmlWidget", widgetTitle, "1", ""); WidgetPart widgetPart = _widgetService.CreateWidget(layerPart.Id, "HtmlWidget", WidgetTitle1, "1", "");
Assert.That(widgetPart, Is.Not.Null); Assert.That(widgetPart, Is.Not.Null);
Assert.That(widgetPart.LayerPart.Id, Is.EqualTo(layerPart.Id)); Assert.That(widgetPart.LayerPart.Id, Is.EqualTo(layerPart.Id));
} }
@@ -211,6 +204,44 @@ namespace Orchard.Tests.Modules.Widgets.Services {
Assert.That(zones.FirstOrDefault(zone => zone == ThemeZoneName2), Is.Not.Null); Assert.That(zones.FirstOrDefault(zone => zone == ThemeZoneName2), Is.Not.Null);
} }
[Test, Ignore("Fix when possible")]
public void MoveWidgetTest() {
LayerPart layerPart = _widgetService.CreateLayer(LayerName1, LayerDescription1, "");
_contentManager.Flush();
// same zone widgets
WidgetPart widgetPart1 = _widgetService.CreateWidget(layerPart.Id, "HtmlWidget", WidgetTitle1, Position1, Zone1);
WidgetPart widgetPart2 = _widgetService.CreateWidget(layerPart.Id, "HtmlWidget", WidgetTitle2, Position2, Zone1);
// different zone widget
WidgetPart widgetPart3 = _widgetService.CreateWidget(layerPart.Id, "HtmlWidget", WidgetTitle3, Position3, Zone2);
_contentManager.Flush();
// test 1 - moving first widget up will have no effect
Assert.That(_widgetService.MoveWidgetUp(widgetPart1), Is.False);
// test 2 - moving first widget down will be successfull
Assert.That(_widgetService.MoveWidgetDown(widgetPart1), Is.True);
widgetPart1 = _widgetService.GetWidget(widgetPart1.Id);
Assert.That(widgetPart1.Position, Is.EqualTo(Position2), "First widget moved to second widget position");
widgetPart2 = _widgetService.GetWidget(widgetPart2.Id);
Assert.That(widgetPart2.Position, Is.EqualTo(Position1), "Second widget moved to first widget position");
// test 3 - moving last widget down will have no effect even though there is a widget in another zone with a higher position
Assert.That(_widgetService.MoveWidgetDown(widgetPart1), Is.False);
widgetPart1 = _widgetService.GetWidget(widgetPart1.Id);
Assert.That(widgetPart1.Position, Is.EqualTo(Position2), "Widget remained in the same position");
widgetPart2 = _widgetService.GetWidget(widgetPart2.Id);
Assert.That(widgetPart2.Position, Is.EqualTo(Position1), "Widget remained in the same position");
widgetPart3 = _widgetService.GetWidget(widgetPart3.Id);
Assert.That(widgetPart3.Position, Is.EqualTo(Position3), "Widget remained in the same position");
}
public class StubLayerPartHandler : ContentHandler { public class StubLayerPartHandler : ContentHandler {
public StubLayerPartHandler(IRepository<LayerPartRecord> layersRepository) { public StubLayerPartHandler(IRepository<LayerPartRecord> layersRepository) {
Filters.Add(new ActivatingFilter<LayerPart>("Layer")); Filters.Add(new ActivatingFilter<LayerPart>("Layer"));

6
src/Orchard.Web/Modules/Orchard.Widgets/Services/IWidgetsService.cs
View File

@@ -22,7 +22,9 @@ namespace Orchard.Widgets.Services {
void UpdateLayer(int layerId, string name, string description, string layerRule); void UpdateLayer(int layerId, string name, string description, string layerRule);
void DeleteLayer(int layerId); void DeleteLayer(int layerId);
void MoveWidgetUp(int widgetId); bool MoveWidgetUp(int widgetId);
void MoveWidgetDown(int widgetId); bool MoveWidgetUp(WidgetPart widgetPart);
bool MoveWidgetDown(int widgetId);
bool MoveWidgetDown(WidgetPart widgetPart);
} }
} }

54
src/Orchard.Web/Modules/Orchard.Widgets/Services/WidgetsService.cs
View File

@@ -110,26 +110,52 @@ namespace Orchard.Widgets.Services {
_contentManager.Remove(GetWidget(widgetId).ContentItem); _contentManager.Remove(GetWidget(widgetId).ContentItem);
} }
public void MoveWidgetUp(int widgetId) { public bool MoveWidgetUp(WidgetPart widgetPart) {
WidgetPart widgetPart = GetWidget(widgetId);
int currentPosition = int.Parse(widgetPart.Record.Position); int currentPosition = int.Parse(widgetPart.Record.Position);
if (currentPosition > 0) {
WidgetPart widgetBefore = GetWidgets(widgetPart.LayerPart.Id).FirstOrDefault(widgetPartBefore => widgetPartBefore.Record.Position == (currentPosition - 1).ToString()); WidgetPart widgetBefore = GetWidgets(widgetPart.LayerPart.Id)
widgetBefore.Record.Position = currentPosition.ToString(); .Where(widget => widget.Zone == widgetPart.Zone)
widgetPart.Record.Position = (currentPosition - 1).ToString(); .OrderByDescending(widget => widget.Position, new UI.FlatPositionComparer())
.FirstOrDefault(widget => int.Parse(widget.Record.Position) < currentPosition);
if (widgetBefore != null) {
SwitchWidgetPositions(widgetBefore, widgetPart);
return true;
} }
return false;
} }
public void MoveWidgetDown(int widgetId) { public bool MoveWidgetUp(int widgetId) {
WidgetPart widgetPart = GetWidget(widgetId); return MoveWidgetUp(GetWidget(widgetId));
}
public bool MoveWidgetDown(WidgetPart widgetPart) {
int currentPosition = int.Parse(widgetPart.Record.Position); int currentPosition = int.Parse(widgetPart.Record.Position);
if (currentPosition < GetWidgets(widgetPart.LayerPart.Id).Count()) {
WidgetPart widgetAfter = GetWidgets(widgetPart.LayerPart.Id).FirstOrDefault(widgetPartAfter => widgetPartAfter.Record.Position == (currentPosition + 1).ToString()); WidgetPart widgetAfter = GetWidgets(widgetPart.LayerPart.Id)
widgetAfter.Record.Position = currentPosition.ToString(); .Where(widget => widget.Zone == widgetPart.Zone)
widgetPart.Record.Position = (currentPosition + 1).ToString(); .OrderBy(widget => widget.Position, new UI.FlatPositionComparer())
} .FirstOrDefault(widget => int.Parse(widget.Record.Position) > currentPosition);
if (widgetAfter != null) {
SwitchWidgetPositions(widgetAfter, widgetPart);
return true;
}
return false;
}
public bool MoveWidgetDown(int widgetId) {
return MoveWidgetDown(GetWidget(widgetId));
}
private static void SwitchWidgetPositions(WidgetPart sourceWidget, WidgetPart targetWidget) {
string tempPosition = sourceWidget.Record.Position;
sourceWidget.Record.Position = targetWidget.ToString();
targetWidget.Record.Position = tempPosition;
} }
} }
} }

11
src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/Index.cshtml
View File

@@ -49,14 +49,21 @@
<li> <li>
<div class="widgets-zone">@zone</div> <div class="widgets-zone">@zone</div>
<ul> <ul>
@{
int count = Model.CurrentLayerWidgets.Where(widgetPart => widgetPart.Zone == zone).Count() - 1;
int i = 0;
}
@foreach (WidgetPart widget in Model.CurrentLayerWidgets.Where(widgetPart => widgetPart.Zone == zone).OrderBy(widgetPart => widgetPart.Position, new Orchard.UI.FlatPositionComparer())) { @foreach (WidgetPart widget in Model.CurrentLayerWidgets.Where(widgetPart => widgetPart.Zone == zone).OrderBy(widgetPart => widgetPart.Position, new Orchard.UI.FlatPositionComparer())) {
<li class="widgets-zoneWidget"> <li class="widgets-zoneWidget">
@if (widget.Position != "1") { @if (i > 0) {
<input type="image" name="submit.MoveUp.@widget.Id" src="@Url.Content("~/modules/orchard.widgets/Content/Admin/images/moveup.gif")" alt="Move up" value="@widget.Id" /> <input type="image" name="submit.MoveUp.@widget.Id" src="@Url.Content("~/modules/orchard.widgets/Content/Admin/images/moveup.gif")" alt="Move up" value="@widget.Id" />
} }
@if (int.Parse(widget.Position) < Model.CurrentLayerWidgets.Where(widgetPart => widgetPart.Zone == zone).Count()) { @if (i < count) {
<input type="image" name="submit.MoveDown.@widget.Id" src="@Url.Content("~/modules/orchard.widgets/Content/Admin/images/movedown.gif")" alt="Move down" value="@widget.Id" /> <input type="image" name="submit.MoveDown.@widget.Id" src="@Url.Content("~/modules/orchard.widgets/Content/Admin/images/movedown.gif")" alt="Move down" value="@widget.Id" />
} }
@{
i++;
}
@Html.ActionLink(@widget.Title, "EditWidget", new { @widget.Id }) @Html.ActionLink(@widget.Title, "EditWidget", new { @widget.Id })
</li> </li>
} }