From 5a7efc6037ed5804e4f0e5c7bdaa7fdddd4ad578 Mon Sep 17 00:00:00 2001
From: David Spiola <david@webandco.com>
Date: Sun, 18 Jan 2015 19:28:07 +0100
Subject: [PATCH 1/2] [bug] remove DefaultNodeLabelGenerator in order to work
 properly with Neos 1.2.

- In Neos 1.2 an default Eel expression is taking care of the default node label
---
 .../Model/DefaultNodeLabelGenerator.php       | 42 -------------------
 Configuration/Settings.yaml                   |  1 -
 2 files changed, 43 deletions(-)
 delete mode 100644 Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/DefaultNodeLabelGenerator.php

diff --git a/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/DefaultNodeLabelGenerator.php b/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/DefaultNodeLabelGenerator.php
deleted file mode 100644
index 56e9c5a..0000000
--- a/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/DefaultNodeLabelGenerator.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-namespace Flowpack\SchemaOrg\NodeTypes\Domain\Model;
-
-/*                                                                               *
- * This script belongs to the TYPO3 Flow package "Flowpack.SchemaOrg.NodeTypes". *
- *                                                                               *
- * It is free software; you can redistribute it and/or modify it under           *
- * the terms of the GNU Lesser General Public License, either version 3          *
- * of the License, or (at your option) any later version.                        *
- *                                                                               *
- * The TYPO3 project - inspiring people to share!                                *
- *                                                                               */
-
-use TYPO3\Flow\Annotations as Flow;
-use TYPO3\TYPO3CR\Domain\Model\AbstractNodeData;
-use TYPO3\TYPO3CR\Domain\Model\NodeInterface;
-use TYPO3\TYPO3CR\Domain\Model\NodeLabelGeneratorInterface;
-
-/**
- * The default node label generator; used if no-other is configured
- *
- * @Flow\Scope("singleton")
- */
-class DefaultNodeLabelGenerator implements NodeLabelGeneratorInterface {
-
-	/**
-	 * Render a node label
-	 *
-	 * @param NodeInterface $node
-	 * @param boolean $crop
-	 * @return string
-	 */
-	public function getLabel(NodeInterface $node, $crop = TRUE) {
-		if ($node->hasProperty('name') === TRUE && $node->getProperty('name') !== '') {
-			$label = strip_tags($node->getProperty('name'));
-		} else {
-			$label = ($node->getNodeType()->getLabel() ?: $node->getNodeType()->getName()) . ' (' . $node->getName() . ')';
-		}
-
-		return $label;
-	}
-}
diff --git a/Configuration/Settings.yaml b/Configuration/Settings.yaml
index 0747c43..3797b8b 100644
--- a/Configuration/Settings.yaml
+++ b/Configuration/Settings.yaml
@@ -25,7 +25,6 @@ Flowpack:
       typeDefaultConfiguration:
         '*':
           abstract: TRUE
-          nodeLabelGenerator: 'Flowpack\SchemaOrg\NodeTypes\Domain\Model\DefaultNodeLabelGenerator'
           ui:
             icon: 'icon-gear'
 

From 542451361dd1c420c9080258a41d15519762fe15 Mon Sep 17 00:00:00 2001
From: David Spiola <david@webandco.com>
Date: Sun, 18 Jan 2015 19:30:24 +0100
Subject: [PATCH 2/2] [bug] disable comment mixin for now because it causes
 error in the neos configuration module

---
 .../Flowpack/SchemaOrg/NodeTypes/Domain/Model/Property.php    | 2 +-
 Configuration/Settings.yaml                                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/Property.php b/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/Property.php
index daaf335..0fddbf3 100644
--- a/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/Property.php
+++ b/Classes/Flowpack/SchemaOrg/NodeTypes/Domain/Model/Property.php
@@ -94,7 +94,7 @@ public function __construct(ConfigurationService $configurationService, $type, $
 		$this->comment = (string)$comment;
 		$this->ui = Arrays::arrayMergeRecursiveOverrule($this->ui, array(
 			'label' => $this->label,
-			'comment' => $this->comment,
+			//'comment' => $this->comment,
 			'inspector' => array(
 				'group' => $groupName
 			)
diff --git a/Configuration/Settings.yaml b/Configuration/Settings.yaml
index 3797b8b..de2cc40 100644
--- a/Configuration/Settings.yaml
+++ b/Configuration/Settings.yaml
@@ -72,8 +72,8 @@ Flowpack:
         'articleBody':
           - 'Flowpack.SchemaOrg.NodeTypes:ArticleBodyMixin'
 
-        'comment':
-          - 'Flowpack.SchemaOrg.NodeTypes:CommentMixin'
+#        'comment':
+#          - 'Flowpack.SchemaOrg.NodeTypes:CommentMixin'
 
 #        'address':
 #          - 'Flowpack.SchemaOrg.NodeTypes:AdressMixin'