Merge pull request #2 from cleggypdc/pimcore4

fixed broken plugin path references (Pimcore 4 Branch)
pimcore · Apr 26, 2017 · 91de173 · 91de173
2 parents 8fdb171 + 558be12
commit 91de173
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/controllers/AdminController.php b/controllers/AdminController.php
@@ -17,7 +17,7 @@
 
 use Elements\OutputDataConfigToolkit as OutputDataConfigToolkit;
 
-class Elements_OutputDataConfigToolkit_AdminController extends \Pimcore\Controller\Action\Admin {
+class OutputDataConfigToolkitBundle_AdminController extends \Pimcore\Controller\Action\Admin {
 
     public function init() {
         parent::init();

diff --git a/controllers/RestController.php b/controllers/RestController.php
@@ -17,7 +17,7 @@
 
 use Elements\OutputDataConfigToolkit as OutputDataConfigToolkit;
 
-class Elements_OutputDataConfigToolkit_RestController extends \Pimcore\Controller\Action\Webservice {
+class OutputDataConfigToolkitBundle_RestController extends \Pimcore\Controller\Action\Webservice {
 
     private static $_OUTPUTDATA_CONFIG_TABLE_NAME = "plugin_outputdataconfigtoolkit_outputdefinition";
 

diff --git a/lib/Elements/OutputDataConfigToolkit/Plugin.php b/lib/Elements/OutputDataConfigToolkit/Plugin.php
@@ -75,7 +75,7 @@ public static function install(){
 
         if(!file_exists(PIMCORE_WEBSITE_PATH . "/config/outputdataconfig")) {
             \Pimcore\File::mkdir(PIMCORE_WEBSITE_PATH . "/config/outputdataconfig");
-            copy(PIMCORE_PLUGINS_PATH . "/Elements_OutputDataConfigToolkit/install/config.php", PIMCORE_WEBSITE_PATH . "/config/outputdataconfig/config.php");
+            copy(PIMCORE_PLUGINS_PATH . "/OutputDataConfigToolkitBundle/install/config.php", PIMCORE_WEBSITE_PATH . "/config/outputdataconfig/config.php");
         }
 
         $db = \Pimcore\Db::get();
@@ -155,9 +155,9 @@ public static function getJsClassName(){
     */
 	public static function getTranslationFile($language){
             if($language=="de"){
-                return "/Elements_OutputDataConfigToolkit/texts/de.csv";
+                return "/OutputDataConfigToolkitBundle/texts/de.csv";
             } else if($language=="en"){
-                return "/Elements_OutputDataConfigToolkit/texts/en.csv";
+                return "/OutputDataConfigToolkitBundle/texts/en.csv";
             } else {
                 return null;
             }

diff --git a/plugin.xml b/plugin.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <zend-config xmlns:zf="http://framework.zend.com/xml/zend-config-xml/1.0/">
 		<plugin>
-			<pluginName>Elements_OutputDataConfigToolkit</pluginName>
-			<pluginDescription><![CDATA[Elements_OutputDataConfigToolkit]]></pluginDescription>
+			<pluginName>OutputDataConfigToolkitBundle</pluginName>
+			<pluginDescription><![CDATA[OutputDataConfigToolkitBundle]]></pluginDescription>
             <!-- className of the plugin which extends Pimcore_API_Plugin_Abstract-->
 			<pluginClassName>\Elements\OutputDataConfigToolkit\Plugin</pluginClassName>
 			<!-- include paths relative to plugin-directory -->

diff --git a/static/js/OutputDataConfigTab.js b/static/js/OutputDataConfigTab.js
@@ -63,7 +63,7 @@ pimcore.plugin.outputDataConfigToolkit.Tab = Class.create({
 
     getGrid: function() {
         var proxy = new Ext.data.HttpProxy({
-            url: '/plugin/Elements_OutputDataConfigToolkit/admin/get-output-configs'
+            url: '/plugin/OutputDataConfigToolkitBundle/admin/get-output-configs'
         });
         var readerFields = [
             {name: 'id'},
@@ -177,7 +177,7 @@ pimcore.plugin.outputDataConfigToolkit.Tab = Class.create({
     resetOutputDataConfig: function(configId, answer) {
         if(answer != "no") {
             Ext.Ajax.request({
-                url: '/plugin/Elements_OutputDataConfigToolkit/admin/reset-output-config',
+                url: '/plugin/OutputDataConfigToolkitBundle/admin/reset-output-config',
                 params: {
                     config_id: configId
                 },
@@ -196,7 +196,7 @@ pimcore.plugin.outputDataConfigToolkit.Tab = Class.create({
 
     openConfigDialog: function(configId) {
         Ext.Ajax.request({
-            url: '/plugin/Elements_OutputDataConfigToolkit/admin/get-output-config',
+            url: '/plugin/OutputDataConfigToolkitBundle/admin/get-output-config',
             params: {
                 config_id: configId
             },
@@ -215,7 +215,7 @@ pimcore.plugin.outputDataConfigToolkit.Tab = Class.create({
 
     saveConfigDialog: function(data) {
         Ext.Ajax.request({
-            url: '/plugin/Elements_OutputDataConfigToolkit/admin/save-output-config',
+            url: '/plugin/OutputDataConfigToolkitBundle/admin/save-output-config',
             method: 'POST',
             params: {
                 config_id: data.id,

diff --git a/static/js/outputDataConfigElements/value/StructuredTable.js b/static/js/outputDataConfigElements/value/StructuredTable.js
@@ -56,7 +56,7 @@ pimcore.plugin.outputDataConfigToolkit.outputDataConfigElements.value.Structured
         this.node = node;
 
         Ext.Ajax.request({
-            url: '/plugin/Elements_OutputDataConfigToolkit/admin/get-field-definition',
+            url: '/plugin/OutputDataConfigToolkitBundle/admin/get-field-definition',
             params: {
                 class_id: this.objectClassId,
                 key: node.attributes.configAttributes.attribute

diff --git a/static6/js/OutputDataConfigTab.js b/static6/js/OutputDataConfigTab.js
@@ -69,7 +69,7 @@ pimcore.plugin.outputDataConfigToolkit.Tab = Class.create({
 
         var itemsPerPage = 100000000;
         this.store = pimcore.helpers.grid.buildDefaultStore(
-            '/plugin/Elements_OutputDataConfigToolkit/admin/get-output-configs?',
+            '/plugin/OutputDataConfigToolkitBundle/admin/get-output-configs?',
             [
                 {name: 'id'},
                 {name: 'classname'},
@@ -161,7 +161,7 @@ pimcore.plugin.outputDataConfigToolkit.Tab = Class.create({
     resetOutputDataConfig: function(configId, answer) {
         if(answer != "no") {
             Ext.Ajax.request({
-                url: '/plugin/Elements_OutputDataConfigToolkit/admin/reset-output-config',
+                url: '/plugin/OutputDataConfigToolkitBundle/admin/reset-output-config',
                 params: {
                     config_id: configId
                 },
@@ -180,7 +180,7 @@ pimcore.plugin.outputDataConfigToolkit.Tab = Class.create({
 
     openConfigDialog: function(configId) {
         Ext.Ajax.request({
-            url: '/plugin/Elements_OutputDataConfigToolkit/admin/get-output-config',
+            url: '/plugin/OutputDataConfigToolkitBundle/admin/get-output-config',
             params: {
                 config_id: configId
             },
@@ -199,7 +199,7 @@ pimcore.plugin.outputDataConfigToolkit.Tab = Class.create({
 
     saveConfigDialog: function(data) {
         Ext.Ajax.request({
-            url: '/plugin/Elements_OutputDataConfigToolkit/admin/save-output-config',
+            url: '/plugin/OutputDataConfigToolkitBundle/admin/save-output-config',
             method: 'POST',
             params: {
                 config_id: data.id,

diff --git a/static6/js/outputDataConfigElements/value/StructuredTable.js b/static6/js/outputDataConfigElements/value/StructuredTable.js
@@ -56,7 +56,7 @@ pimcore.plugin.outputDataConfigToolkit.outputDataConfigElements.value.Structured
         this.node = node;
 
         Ext.Ajax.request({
-            url: '/plugin/Elements_OutputDataConfigToolkit/admin/get-field-definition',
+            url: '/plugin/OutputDataConfigToolkitBundle/admin/get-field-definition',
             params: {
                 class_id: this.objectClassId,
                 key: node.data.configAttributes.attribute