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

My SQL and SQL CE fixes for the RelationTypes tree (loadRelationTypes left commented out)

Browse Source
This commit is contained in:
Hendy@Blueberry
2012-07-10 15:07:39 -01:00
parent 271a17aad6
commit 6e22b8a981
6 changed files with 17 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
View File

@@ -1,17 +1,10 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using umbraco;
using umbraco.BasePages;
using umbraco.cms.businesslogic.relation;
using umbraco.cms.businesslogic.web;
using umbraco.DataLayer;
using umbraco.DataLayer.SqlHelpers.SqlServer;
using umbraco.uicontrols;
namespace umbraco.cms.presentation.developer.RelationTypes
@@ -91,9 +84,9 @@ namespace umbraco.cms.presentation.developer.RelationTypes
using (IRecordsReader reader = uQuery.SqlHelper.ExecuteReader(@"
SELECT A.id,
A.parentId,
B.[text] AS 'parentText',
B.[text] AS parentText,
A.childId,
C.[text] AS 'childText',
C.[text] AS childText,
A.relType,
A.[datetime],
A.comment

43
src/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx.cs
View File

@@ -1,10 +1,5 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using umbraco.BasePages;
using umbraco.cms.businesslogic.relation;
@@ -51,16 +46,18 @@ namespace umbraco.cms.presentation.developer.RelationTypes
{
if (this.Page.IsValid)
{
int newRelationTypeId = uQuery.SqlHelper.ExecuteScalar<int>(
string.Format(
"INSERT INTO umbracoRelationType (dual, parentObjectType, childObjectType, name, alias) VALUES ({0}, '{1}', '{2}', '{3}', '{4}')",
this.dualRadioButtonList.SelectedValue,
// UmbracoHelper.GetGuid(UmbracoHelper.GetUmbracoObjectType(this.parentDropDownList.SelectedValue)).ToString(),
// UmbracoHelper.GetGuid(UmbracoHelper.GetUmbracoObjectType(this.childDropDownList.SelectedValue)).ToString(),
uQuery.GetUmbracoObjectType(this.parentDropDownList.SelectedValue).GetGuid().ToString(),
uQuery.GetUmbracoObjectType(this.childDropDownList.SelectedValue).GetGuid().ToString(),
this.descriptionTextBox.Text,
this.aliasTextBox.Text.Trim()) + "; SELECT MAX (id) FROM umbracoRelationType");
uQuery.SqlHelper.ExecuteNonQuery(
string.Format("INSERT INTO umbracoRelationType ([dual], parentObjectType, childObjectType, name, alias) VALUES ({0}, '{1}', '{2}', '{3}', '{4}')",
this.dualRadioButtonList.SelectedValue,
uQuery.GetUmbracoObjectType(this.parentDropDownList.SelectedValue).GetGuid().ToString(),
uQuery.GetUmbracoObjectType(this.childDropDownList.SelectedValue).GetGuid().ToString(),
this.descriptionTextBox.Text,
this.aliasTextBox.Text.Trim()));
int newRelationTypeId = uQuery.SqlHelper.ExecuteScalar<int>("SELECT MAX (id) FROM umbracoRelationType");
// TODO: there's a (very small) possibility that if multiple admins create new relation types at the same time, then this could potentially redirect to the wrong relation type !
// fix by checking the database type in use, so can use the appropriate vendor specific SQL: SCOPE_IDENTITY(), LAST_INSERT_ID() within a single SQL call.
// base.speechBubble(BasePage.speechBubbleIcon.success, "New Relation Type", "relation type created");
@@ -74,22 +71,6 @@ namespace umbraco.cms.presentation.developer.RelationTypes
/// <param name="dropDownList">control for which to add the Umbraco object types</param>
private void AppendUmbracoObjectTypes(DropDownList dropDownList)
{
// dropDownList.Items.Add(new ListItem(UmbracoHelper.GetFriendlyName(UmbracoHelper.UmbracoObjectType.Document), UmbracoHelper.GetName(UmbracoHelper.UmbracoObjectType.Document)));
// dropDownList.Items.Add(new ListItem(UmbracoHelper.GetFriendlyName(UmbracoHelper.UmbracoObjectType.Media), UmbracoHelper.GetName(UmbracoHelper.UmbracoObjectType.Media)));
// dropDownList.Items.Add(new ListItem(UmbracoHelper.GetFriendlyName(UmbracoHelper.UmbracoObjectType.Member), UmbracoHelper.GetName(UmbracoHelper.UmbracoObjectType.Member)));
// ////dropDownList.Items.Add(new ListItem("---", "---"));
// dropDownList.Items.Add(new ListItem(UmbracoHelper.GetFriendlyName(UmbracoHelper.UmbracoObjectType.MemberGroup), UmbracoHelper.GetName(UmbracoHelper.UmbracoObjectType.MemberGroup)));
// dropDownList.Items.Add(new ListItem(UmbracoHelper.GetFriendlyName(UmbracoHelper.UmbracoObjectType.MemberType), UmbracoHelper.GetName(UmbracoHelper.UmbracoObjectType.MemberType)));
// dropDownList.Items.Add(new ListItem(UmbracoHelper.GetFriendlyName(UmbracoHelper.UmbracoObjectType.DocumentType), UmbracoHelper.GetName(UmbracoHelper.UmbracoObjectType.DocumentType)));
// dropDownList.Items.Add(new ListItem(UmbracoHelper.GetFriendlyName(UmbracoHelper.UmbracoObjectType.MediaType), UmbracoHelper.GetName(UmbracoHelper.UmbracoObjectType.MediaType)));
// dropDownList.Items.Add(new ListItem(UmbracoHelper.GetFriendlyName(UmbracoHelper.UmbracoObjectType.ContentItem), UmbracoHelper.GetName(UmbracoHelper.UmbracoObjectType.ContentItem)));
// dropDownList.Items.Add(new ListItem(UmbracoHelper.GetFriendlyName(UmbracoHelper.UmbracoObjectType.ContentItemType), UmbracoHelper.GetName(UmbracoHelper.UmbracoObjectType.ContentItemType)));
// dropDownList.Items.Add(new ListItem(UmbracoHelper.GetFriendlyName(UmbracoHelper.UmbracoObjectType.DataType), UmbracoHelper.GetName(UmbracoHelper.UmbracoObjectType.DataType)));
// dropDownList.Items.Add(new ListItem(UmbracoHelper.GetFriendlyName(UmbracoHelper.UmbracoObjectType.RecycleBin), UmbracoHelper.GetName(UmbracoHelper.UmbracoObjectType.RecycleBin)));
// dropDownList.Items.Add(new ListItem(UmbracoHelper.GetFriendlyName(UmbracoHelper.UmbracoObjectType.ROOT), UmbracoHelper.GetName(UmbracoHelper.UmbracoObjectType.ROOT)));
// dropDownList.Items.Add(new ListItem(UmbracoHelper.GetFriendlyName(UmbracoHelper.UmbracoObjectType.Stylesheet), UmbracoHelper.GetName(UmbracoHelper.UmbracoObjectType.Stylesheet)));
// dropDownList.Items.Add(new ListItem(UmbracoHelper.GetFriendlyName(UmbracoHelper.UmbracoObjectType.Template), UmbracoHelper.GetName(UmbracoHelper.UmbracoObjectType.Template)));
dropDownList.Items.Add(new ListItem(uQuery.UmbracoObjectType.Document.GetFriendlyName(), uQuery.UmbracoObjectType.Document.GetName()));
dropDownList.Items.Add(new ListItem(uQuery.UmbracoObjectType.Media.GetFriendlyName(), uQuery.UmbracoObjectType.Media.GetName()));
dropDownList.Items.Add(new ListItem(uQuery.UmbracoObjectType.Member.GetFriendlyName(), uQuery.UmbracoObjectType.Member.GetName()));

4
src/umbraco.presentation/umbraco/developer/RelationTypes/ReadOnlyRelation.cs
View File

@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using umbraco.cms.businesslogic.relation;
namespace umbraco.cms.presentation.developer.RelationTypes
{

4
src/umbraco.presentation/umbraco/developer/RelationTypes/RelationTypesWebService.asmx.cs
View File

@@ -1,6 +1,4 @@
using System;
using System.Web;
using System.Web.Services;
using System.Web.Services;
namespace umbraco.cms.presentation.developer.RelationTypes
{

4
src/umbraco.presentation/umbraco/developer/RelationTypes/TreeMenu/ActionDeleteRelationType.cs
View File

@@ -1,6 +1,4 @@
using System;
using umbraco;
using umbraco.interfaces;
using umbraco.interfaces;
namespace umbraco.cms.presentation.developer.RelationTypes.TreeMenu
{

4
src/umbraco.presentation/umbraco/developer/RelationTypes/TreeMenu/ActionNewRelationType.cs
View File

@@ -1,6 +1,4 @@
using System;
using umbraco;
using umbraco.interfaces;
using umbraco.interfaces;
namespace umbraco.cms.presentation.developer.RelationTypes.TreeMenu
{