Merge
This commit is contained in:
@@ -260,6 +260,10 @@ namespace umbraco.editorControls.tinymce
|
|||||||
SqlHelper.CreateParameter("@value",data),
|
SqlHelper.CreateParameter("@value",data),
|
||||||
SqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId)};
|
SqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId)};
|
||||||
SqlHelper.ExecuteNonQuery("delete from cmsDataTypePreValues where datatypenodeid = @dtdefid",SqlParams);
|
SqlHelper.ExecuteNonQuery("delete from cmsDataTypePreValues where datatypenodeid = @dtdefid",SqlParams);
|
||||||
|
// we need to populate the parameters again due to an issue with SQL CE
|
||||||
|
SqlParams = new IParameter[] {
|
||||||
|
SqlHelper.CreateParameter("@value",data),
|
||||||
|
SqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId)};
|
||||||
SqlHelper.ExecuteNonQuery("insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,0,'')",SqlParams);
|
SqlHelper.ExecuteNonQuery("insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,0,'')",SqlParams);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -126,6 +126,10 @@ namespace umbraco.editorControls.ultimatepicker
|
|||||||
SqlHelper.CreateParameter("@value",data),
|
SqlHelper.CreateParameter("@value",data),
|
||||||
SqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId)};
|
SqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId)};
|
||||||
SqlHelper.ExecuteNonQuery("delete from cmsDataTypePreValues where datatypenodeid = @dtdefid", SqlParams);
|
SqlHelper.ExecuteNonQuery("delete from cmsDataTypePreValues where datatypenodeid = @dtdefid", SqlParams);
|
||||||
|
// need to unlock the parameters (for SQL CE compat)
|
||||||
|
SqlParams = new IParameter[] {
|
||||||
|
SqlHelper.CreateParameter("@value",data),
|
||||||
|
SqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId)};
|
||||||
SqlHelper.ExecuteNonQuery("insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,0,'')", SqlParams);
|
SqlHelper.ExecuteNonQuery("insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,0,'')", SqlParams);
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -84,7 +84,11 @@ namespace umbraco.editorControls.uploadfield
|
|||||||
SqlHelper.CreateParameter("@value",data),
|
SqlHelper.CreateParameter("@value",data),
|
||||||
SqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId)};
|
SqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId)};
|
||||||
SqlHelper.ExecuteNonQuery("delete from cmsDataTypePreValues where datatypenodeid = @dtdefid",SqlParams);
|
SqlHelper.ExecuteNonQuery("delete from cmsDataTypePreValues where datatypenodeid = @dtdefid",SqlParams);
|
||||||
SqlHelper.ExecuteNonQuery("insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,0,'')",SqlParams);
|
// need to unlock the parameters (for SQL CE compat)
|
||||||
|
SqlParams = new IParameter[] {
|
||||||
|
SqlHelper.CreateParameter("@value",data),
|
||||||
|
SqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId)};
|
||||||
|
SqlHelper.ExecuteNonQuery("insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,0,'')", SqlParams);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void Render(HtmlTextWriter writer)
|
protected override void Render(HtmlTextWriter writer)
|
||||||
|
|||||||
Reference in New Issue
Block a user