Merge branch 'master' of github.com:YAG-Gallery/yag

kiwi2101 · Oct 10, 2015 · 47bd60e · 47bd60e
2 parents 58b72c2 + b1da79e
commit 47bd60e
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 14 deletions.
diff --git a/Classes/Domain/Repository/ItemRepository.php b/Classes/Domain/Repository/ItemRepository.php
@@ -159,7 +159,7 @@ public function getItemsAfterThisItem(Tx_Yag_Domain_Model_Item $item = NULL, $li
 
 		} elseif ($result->count() == 1 && $result->current() !== FALSE) {
 			$object = $result->current();
-            $session = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\Session::class);
+            $session = $this->objectManager->get('TYPO3\CMS\Extbase\Persistence\Generic\Session');
             $session->registerObject($object, $object->getUid());
 			return $object;
 

diff --git a/Classes/Domain/Repository/ResolutionFileCacheRepository.php b/Classes/Domain/Repository/ResolutionFileCacheRepository.php
@@ -98,7 +98,7 @@ public function getResolutionByItem(Tx_Yag_Domain_Model_Item $item, Tx_Yag_Domai
 
 		if ($result !== NULL && !is_array($result) && $result->current() !== FALSE) {
 			$object = $result->current();
-            $session = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\Session::class);
+			$session = $this->objectManager->get('TYPO3\CMS\Extbase\Persistence\Generic\Session');
 			$session->registerObject($object, $object->getUid());
 		}
 

diff --git a/Configuration/TypoScript/BaseConfig/Framework.ts b/Configuration/TypoScript/BaseConfig/Framework.ts
@@ -56,11 +56,6 @@ config.tx_extbase {
 
     # Object manager configuration for Dependency Injection
     objects {
-    	# TYPO3 < 6.0
-    	Tx_Extbase_Persistence_BackendInterface.className = Tx_Yag_Extbase_Persistence_Backend
-    	Tx_PtExtbase_Rbac_RbacServiceInterface.className = Tx_PtExtbase_Rbac_TypoScriptRbacService
-
-    	# TYPO3 >= 6.0
 		TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface.className = Tx_Yag_Extbase_Persistence_Backend
     }
 }
@@ -69,4 +64,10 @@ config.tx_extbase {
 * This configuration is needed to achieve the behaviour of extbase 1.3.0 in extbase > 1.4.1
 * concerning default controller/actions configured with switchableControllerActions.
 */
-plugin.tx_yag.mvc.callDefaultActionIfActionCantBeResolved = 1
+plugin.tx_yag {
+	mvc.callDefaultActionIfActionCantBeResolved = 1
+
+	view {
+		layoutRootPath = {$plugin.tx_yag.view.layoutRootPath}
+	}
+}
diff --git a/Configuration/TypoScript/constants.txt b/Configuration/TypoScript/constants.txt
@@ -9,4 +9,8 @@ config.yag {
 
 	# cat=YAG/file/030; type=boolean; label=LLL:EXT:yag/Resources/Private/Language/locallang.xlf:tx_yag_constants.addFancyBox
 	addLightBox = 1
+}
+
+plugin {
+	tx_yag.view.layoutRootPath = EXT:yag/Resources/Private/Layouts/
 }
diff --git a/Documentation/Yag-YetAnotherGallery/Changelog/Index.rst b/Documentation/Yag-YetAnotherGallery/Changelog/Index.rst
@@ -31,15 +31,21 @@ Gallery/yag/commits/master>`_
    :Changes:
       Changes:
 
+ - :Version:
+      4.0.7
+
+   :Changes:
+
+       [TASK] Fix Backend Ajax requests
 
  - :Version:
-      4.1.0
+      4.0.6
 
    :Changes:
 
        [TASK] Fix Backend Layout for 7.4
 
-       [FEATURE] Synchronize sorting/deleted flag of tranlsated enteties
+       [FEATURE] Synchronize sorting/deleted flag of translated enteties
 
        [BUGFIX] Removed usage of deprecated identityMap
 

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -34,7 +34,7 @@
     array (
       'pt_extlist' => '2.0.4',
       'pt_extbase' => '2.0.0',
-      'typo3' => '6.2.0-7.4.99',
+      'typo3' => '6.2.0-7.5.99',
     ),
     'conflicts' => 
     array (

diff --git a/ext_localconf.php b/ext_localconf.php
@@ -80,10 +80,21 @@
 
 	// Flexform record selector
 	require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('yag').'Classes/Utility/Flexform/RecordSelector.php';
-	$TYPO3_CONF_VARS['BE']['AJAX']['txyagM1::getGalleryList'] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('yag').'Classes/Utility/Flexform/RecordSelector.php:user_Tx_Yag_Utility_Flexform_RecordSelector->getGallerySelectList';
-	$TYPO3_CONF_VARS['BE']['AJAX']['txyagM1::getAlbumList'] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('yag').'Classes/Utility/Flexform/RecordSelector.php:user_Tx_Yag_Utility_Flexform_RecordSelector->getAlbumSelectList';
-	$TYPO3_CONF_VARS['BE']['AJAX']['txyagM1::getImageList'] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('yag').'Classes/Utility/Flexform/RecordSelector.php:user_Tx_Yag_Utility_Flexform_RecordSelector->getImageSelectList';
 
+    $yagGalleryRecordSelectorClass = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('yag') . 'Classes/Utility/Flexform/RecordSelector.php:user_Tx_Yag_Utility_Flexform_RecordSelector';
+
+
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::registerAjaxHandler (
+        'txyagM1::getGalleryList', $yagGalleryRecordSelectorClass . '->getGallerySelectList', FALSE
+    );
+
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::registerAjaxHandler (
+        'txyagM1::getAlbumList', $yagGalleryRecordSelectorClass . '->getAlbumSelectList', FALSE
+    );
+
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::registerAjaxHandler (
+        'txyagM1::getImageList', $yagGalleryRecordSelectorClass . '->getImageSelectList', FALSE
+    );
 
 
 	/*