Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes Workflow Consistency module in K9 #127

Merged
merged 2 commits into from
Nov 10, 2016
Merged

Fixes Workflow Consistency module in K9 #127

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f68571
Merge pull request #1 from Kentico/master
Enngage Nov 9, 2016
6ba4854
Fixes Workflow Consistency module in K9 when page is using page type …
Enngage Nov 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 20 additions & 10 deletions KInspector.Modules/Modules/Content/WorkflowConsistencyModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ public ModuleMetadata GetModuleMetadata()
return new ModuleMetadata
{
Name = "Workflow consistency",
SupportedVersions = new[] {
SupportedVersions = new[] {
new Version("7.0"),
new Version("8.0"),
new Version("8.0"),
new Version("8.1"),
new Version("8.2"),
new Version("9.0") },
Expand Down Expand Up @@ -92,6 +92,12 @@ private List<ResultItem> FindDocumentsWithInconsistencies()
{
var classItem = GetClassItem(document.ClassName);

if (!classItem.ClassIsDocumentType || !classItem.ClassIsCoupledClass)
{
// Skip processing of document that has no coupled table
continue;
}

// Get published data values
var publishedValues = GetDictionaryWithValues(classItem, document.DocumentForeignKeyValue);

Expand Down Expand Up @@ -227,13 +233,13 @@ private List<DocumentItem> GetDocuments()
{
list.Add(new DocumentItem
{
DocumentID = Convert.ToInt32(documentItem["DocumentID"]),
DocumentName = documentItem["DocumentName"].ToString(),
ClassName = documentItem["ClassName"].ToString(),
DocumentForeignKeyValue = Convert.ToInt32(documentItem["DocumentForeignKeyValue"]),
DocumentID = Convert.IsDBNull(documentItem["DocumentID"]) ? 0 : Convert.ToInt32(documentItem["DocumentID"]),
DocumentName = documentItem["DocumentName"]?.ToString(),
ClassName = documentItem["ClassName"]?.ToString(),
DocumentForeignKeyValue = Convert.IsDBNull(documentItem["DocumentForeignKeyValue"]) ? 0 : Convert.ToInt32(documentItem["DocumentForeignKeyValue"]),
NodeXML = documentItem["NodeXML"].ToString(),
NodeAliasPath = documentItem["NodeAliasPath"].ToString(),
DocumentCulture = documentItem["DocumentCulture"].ToString()
NodeAliasPath = documentItem["NodeAliasPath"]?.ToString(),
DocumentCulture = documentItem["DocumentCulture"]?.ToString()
});
}

Expand All @@ -242,7 +248,7 @@ private List<DocumentItem> GetDocuments()

private void InitializeClassNames()
{
var sql = "select ClassName, ClassFormDefinition, ClassTableName from CMS_Class where ClassIsDocumentType = '1'";
var sql = "select ClassName, ClassFormDefinition, ClassTableName, ClassIsCoupledClass, ClassIsDocumentType from CMS_Class";
var result = InstanceInfo.DBService.ExecuteAndGetDataSet(sql);

var list = new List<ClassItem>();
Expand All @@ -253,7 +259,9 @@ private void InitializeClassNames()
{
ClassName = classItem["ClassName"].ToString(),
TableName = classItem["ClassTableName"].ToString(),
ClassFormDefinition = classItem["ClassFormDefinition"].ToString()
ClassFormDefinition = classItem["ClassFormDefinition"].ToString(),
ClassIsCoupledClass = Convert.ToBoolean(classItem["ClassIsCoupledClass"]),
ClassIsDocumentType = Convert.ToBoolean(classItem["ClassIsDocumentType"]),
});
}

Expand Down Expand Up @@ -301,6 +309,8 @@ private class DocumentItem

private class ClassItem
{
public bool ClassIsDocumentType { get; set; }
public bool ClassIsCoupledClass { get; set; }
public string ClassName { get; set; }
public string TableName { get; set; }
public string ClassFormDefinition { get; set; }
Expand Down