yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge with 6.0.4

Browse Source
This commit is contained in:
Sebastiaan Janssen
2013-04-09 07:19:47 -02:00
parent 63cae70ec3 a4ed0e266c
commit 1c5cd4e245
2 changed files with 30 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/umbraco.webservices/maintenance/maintenanceService.cs
View File

@@ -9,7 +9,6 @@ namespace umbraco.webservices.maintenance
[ToolboxItem(false)]
public class maintenanceService : BaseWebService
{
override public Services Service
{
get
@@ -24,7 +23,7 @@ namespace umbraco.webservices.maintenance
// We check if services are enabled and user has access
Authenticate(username, password);
Version thisVersion = new Version(0, 9);
var thisVersion = new Version(0, 10);
return Convert.ToString(thisVersion);
}
@@ -36,6 +35,5 @@ namespace umbraco.webservices.maintenance
System.Web.HttpRuntime.UnloadAppDomain();
}
}
}

92
src/umbraco.webservices/templates/templateService.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Web.Services;
using Umbraco.Core;
using Umbraco.Web;
@@ -40,6 +41,7 @@ namespace umbraco.webservices.templates
{
throw new Exception("Could not load template from alias: " + alias);
}
if (template == null)
{
throw new Exception("Could not load template from alias: " + alias);
@@ -52,15 +54,9 @@ namespace umbraco.webservices.templates
[WebMethod]
public List<templateCarrier> readList(string username, string password)
{
List<templateCarrier> templateCarriers = new List<templateCarrier>();
Authenticate(username, password);
foreach (cms.businesslogic.template.Template template in cms.businesslogic.template.Template.GetAllAsList())
{
templateCarriers.Add(createTemplateCarrier(template));
}
return templateCarriers;
return cms.businesslogic.template.Template.GetAllAsList().Select(createTemplateCarrier).ToList();
}
@@ -70,9 +66,11 @@ namespace umbraco.webservices.templates
{
Authenticate(username, password);
if (id == 0) throw new Exception("ID must be specifed when updating");
if (id == 0)
throw new Exception("ID must be specifed when updating");
var template = new cms.businesslogic.template.Template(id);
cms.businesslogic.template.Template template = new cms.businesslogic.template.Template(id);
template.delete();
}
@@ -85,10 +83,10 @@ namespace umbraco.webservices.templates
if (carrier == null) throw new Exception("No carrier specified");
// Get the user
umbraco.BusinessLogic.User user = GetUser(username, password);
BusinessLogic.User user = GetUser(username, password);
// Create template
cms.businesslogic.template.Template template = cms.businesslogic.template.Template.MakeNew(carrier.Name, user);
var template = cms.businesslogic.template.Template.MakeNew(carrier.Name, user);
template.MasterTemplate = carrier.MastertemplateId;
template.Alias = carrier.Alias;
@@ -101,10 +99,13 @@ namespace umbraco.webservices.templates
[WebMethod]
public void update(templateCarrier carrier, string username, string password)
{
Authenticate(username, password);
if (carrier.Id == 0) throw new Exception("ID must be specifed when updating");
if (carrier == null) throw new Exception("No carrier specified");
cms.businesslogic.template.Template template;
try
{
template = new cms.businesslogic.template.Template(carrier.Id);
@@ -127,6 +128,7 @@ namespace umbraco.webservices.templates
Authenticate(username, password);
cms.businesslogic.template.Template template;
try
{
template = new cms.businesslogic.template.Template(id);
@@ -135,72 +137,36 @@ namespace umbraco.webservices.templates
{
throw new Exception("Template with ID " + id + " not found");
}
if (template == null)
{
throw new Exception("Template with ID " + id + " not found");
}
return createTemplateCarrier(template);
}
public templateCarrier createTemplateCarrier(cms.businesslogic.template.Template template)
{
templateCarrier carrier = new templateCarrier();
carrier.Id = template.Id;
carrier.MastertemplateId = template.MasterTemplate;
carrier.Alias = template.Alias;
carrier.Name = template.Text;
carrier.Design = template.Design;
carrier.MasterPageFile = template.MasterPageFile;
var carrier = new templateCarrier
{
Id = template.Id,
MastertemplateId = template.MasterTemplate,
Alias = template.Alias,
Name = template.Text,
Design = template.Design,
MasterPageFile = template.MasterPageFile
};
return carrier;
}
public class templateCarrier
{
private int id;
private int mastertemplateId;
private string name;
private string alias;
private string design;
private string masterPageFile;
public int Id
{
get { return id; }
set { id = value; }
}
public int MastertemplateId
{
get { return mastertemplateId; }
set { mastertemplateId = value; }
}
public string MasterPageFile
{
get { return masterPageFile; }
set { masterPageFile = value; }
}
public string Name
{
get { return name; }
set { name = value; }
}
public string Alias
{
get { return alias; }
set { alias = value; }
}
public string Design
{
get { return design; }
set { design = value; }
}
public int Id { get; set; }
public int MastertemplateId { get; set; }
public string MasterPageFile { get; set; }
public string Name { get; set; }
public string Alias { get; set; }
public string Design { get; set; }
}
}
}