From e68e865fe3d1a7f2b8e562837e1acc4a46d379f1 Mon Sep 17 00:00:00 2001 From: "Franco.vitelli" Date: Wed, 27 Mar 2019 18:13:08 +0100 Subject: [PATCH 01/19] Adjusting code style --- app/code/local/Tribook/Blog/Block/Block.php | 6 - app/code/local/Tribook/Blog/Helper/Config.php | 23 ++++ app/code/local/Tribook/Blog/Helper/Data.php | 11 +- app/code/local/Tribook/Blog/Model/Post.php | 14 ++- .../Tribook/Blog/Model/Resource/Post.php | 19 ++- .../Blog/Model/Resource/Post/Collection.php | 15 ++- .../Tribook/Blog/Model/Resource/Setup.php | 108 ++++++++++-------- .../Blog/controllers/IndexController.php | 3 +- app/code/local/Tribook/Blog/etc/adminhtml.xml | 4 +- app/code/local/Tribook/Blog/etc/config.xml | 28 ++--- app/code/local/Tribook/Blog/etc/system.xml | 8 +- .../sql/tribook_blog_setup/install-0.1.0.php | 28 ++--- .../upgrade-0.1.0-0.1.1.php | 15 ++- app/etc/modules/TbBlog.xml | 9 ++ 14 files changed, 176 insertions(+), 115 deletions(-) delete mode 100644 app/code/local/Tribook/Blog/Block/Block.php create mode 100644 app/code/local/Tribook/Blog/Helper/Config.php create mode 100644 app/etc/modules/TbBlog.xml diff --git a/app/code/local/Tribook/Blog/Block/Block.php b/app/code/local/Tribook/Blog/Block/Block.php deleted file mode 100644 index 2084ca3..0000000 --- a/app/code/local/Tribook/Blog/Block/Block.php +++ /dev/null @@ -1,6 +0,0 @@ -isLogEnable = Mage::getStoreConfig(self::LOG_ENABLE_CONFIG) ?: false; + $this->isLogEnable = Mage::getStoreConfig(Tribook_Blog_Helper_Config::LOG_ENABLE_CONFIG) ?: false; } - /** - * @param $message + * @var $message * @return string */ public function log($message) diff --git a/app/code/local/Tribook/Blog/Model/Post.php b/app/code/local/Tribook/Blog/Model/Post.php index 4612c38..26caa20 100644 --- a/app/code/local/Tribook/Blog/Model/Post.php +++ b/app/code/local/Tribook/Blog/Model/Post.php @@ -1,8 +1,16 @@ _init('tribook_blog/post');//Resource model + $this->_init('tribook_blog/post'); } -} +} \ No newline at end of file diff --git a/app/code/local/Tribook/Blog/Model/Resource/Post.php b/app/code/local/Tribook/Blog/Model/Resource/Post.php index 76838a1..ef28b7b 100644 --- a/app/code/local/Tribook/Blog/Model/Resource/Post.php +++ b/app/code/local/Tribook/Blog/Model/Resource/Post.php @@ -1,20 +1,27 @@ setType('tribook_blog_post'); //entity type resource che andrà ad usare. + $this->setType(Tribook_Blog_Helper_Config::ENTITY_TYPE_CODE_POST); $this->setConnection( - $resource->getConnection('blog_read'), //connections read/write - $resource->getConnection('blog_write') + $resource->getConnection(Tribook_Blog_Helper_Config::CONNECTION_READ), + $resource->getConnection(Tribook_Blog_Helper_Config::CONNECTION_WRITE) ); } - + /** + * Tribook_Blog_Model_Resource_Post getDefaultAttributes. + * @return array + */ protected function __getDefaultAttributes() { return [ @@ -24,6 +31,6 @@ protected function __getDefaultAttributes() 'updated_at', 'increment_id', 'store_id', - ]; + ]; } -} +} \ No newline at end of file diff --git a/app/code/local/Tribook/Blog/Model/Resource/Post/Collection.php b/app/code/local/Tribook/Blog/Model/Resource/Post/Collection.php index 97f14fb..9c13f0f 100644 --- a/app/code/local/Tribook/Blog/Model/Resource/Post/Collection.php +++ b/app/code/local/Tribook/Blog/Model/Resource/Post/Collection.php @@ -1,11 +1,16 @@ _init('tribook_blog/post'); } -} - - - +} \ No newline at end of file diff --git a/app/code/local/Tribook/Blog/Model/Resource/Setup.php b/app/code/local/Tribook/Blog/Model/Resource/Setup.php index 8332770..2517d9b 100644 --- a/app/code/local/Tribook/Blog/Model/Resource/Setup.php +++ b/app/code/local/Tribook/Blog/Model/Resource/Setup.php @@ -1,51 +1,63 @@ array( - 'entity_model' => 'tribook_blog/post', - 'attribute_model'=>'', - 'table'=>'tribook_blog/post_entity', - 'attributes' => array( - 'title' => array( - 'type'=>'varchar', - 'backend'=>'', - 'frontend'=>'', - 'label' => 'Title', - 'input' => 'text', - 'class' => '', - 'source' => '', - 'global' => 0, - 'visible' => true, - 'required' => true, - 'user_defined' => true, - 'default' => '', - 'searchable' => false, - 'filterable' => false, - 'comparable' => false, - 'visible_on_front' => true, - 'unique' => false, - ), - 'author' => array( - 'type'=>'varchar', - 'label' => 'Author', - 'input' => 'text', - 'class' => '', - 'source' => '', - 'global' => 0, - 'visible' => true, - 'required' => true, - 'user_defined' => true, - 'default' => '', - 'searchable' => false, - 'filterable' => false, - 'comparable' => false, - 'visible_on_front' => true, - 'unique' => false, - ), - ), - ) - ); - return $entities; + +/** + * Class Tribook_Blog_Model_Resource_Setup + */ +class Tribook_Blog_Model_Resource_Setup extends Mage_Eav_Model_Entity_Setup +{ + /** + * Method Tribook_Blog_Model_Resource_Setup getDefaultEntities. + * @var $entities + * @return array + */ + public function getDefaultEntities() + { + $entities = [ + Tribook_Blog_Helper_Config::ENTITY_TYPE_CODE_POST => [ + 'entity_model' => Tribook_Blog_Helper_Config::ENTITY_MODEL_POST, + 'attribute_model' => '', + 'table' => Tribook_Blog_Helper_Config::ENTITY_TABLE_POST, + 'attributes' => [ + 'title' => [ + 'type' => 'varchar', + 'backend' => '', + 'frontend' => '', + 'label' => 'Title', + 'input' => 'text', + 'class' => '', + 'source' => '', + 'global' => 0, + 'visible' => true, + 'required' => true, + 'user_defined' => true, + 'default' => '', + 'searchable' => false, + 'filterable' => false, + 'comparable' => false, + 'visible_on_front' => true, + 'unique' => false, + ], + 'author' => [ + 'type' => 'varchar', + 'label' => 'Author', + 'input' => 'text', + 'class' => '', + 'source' => '', + 'global' => 0, + 'visible' => true, + 'required' => true, + 'user_defined' => true, + 'default' => '', + 'searchable' => false, + 'filterable' => false, + 'comparable' => false, + 'visible_on_front' => true, + 'unique' => false, + ] + ] + ] + ]; + + return $entities; } } \ No newline at end of file diff --git a/app/code/local/Tribook/Blog/controllers/IndexController.php b/app/code/local/Tribook/Blog/controllers/IndexController.php index 92f4b88..b0215d6 100644 --- a/app/code/local/Tribook/Blog/controllers/IndexController.php +++ b/app/code/local/Tribook/Blog/controllers/IndexController.php @@ -1,4 +1,5 @@ getCollection() ->addAttributeToSelect('title') diff --git a/app/code/local/Tribook/Blog/etc/adminhtml.xml b/app/code/local/Tribook/Blog/etc/adminhtml.xml index 822240d..438fbf8 100644 --- a/app/code/local/Tribook/Blog/etc/adminhtml.xml +++ b/app/code/local/Tribook/Blog/etc/adminhtml.xml @@ -8,9 +8,9 @@ - + Tribook - + diff --git a/app/code/local/Tribook/Blog/etc/config.xml b/app/code/local/Tribook/Blog/etc/config.xml index 523c122..b603b37 100644 --- a/app/code/local/Tribook/Blog/etc/config.xml +++ b/app/code/local/Tribook/Blog/etc/config.xml @@ -1,27 +1,27 @@ - + 0.1.1 - + - + Tribook_Blog_Block - + - + Tribook_Blog_Helper - + - + Tribook_Blog_Model tribook_blog_resource - - + + Tribook_Blog_Model_Resource @@ -46,10 +46,10 @@ tribook_blog_post_entity_char
-
+
- + Tribook_Blog Tribook_Blog_Model_Resource_Setup @@ -57,7 +57,7 @@ core_setup - + core_write @@ -72,13 +72,13 @@
- + standard Tribook_Blog blog - +
\ No newline at end of file diff --git a/app/code/local/Tribook/Blog/etc/system.xml b/app/code/local/Tribook/Blog/etc/system.xml index 5461e92..08a54fd 100644 --- a/app/code/local/Tribook/Blog/etc/system.xml +++ b/app/code/local/Tribook/Blog/etc/system.xml @@ -1,13 +1,13 @@ - + 99999 - + - + tribook_tab 1000 @@ -35,6 +35,6 @@ - + \ No newline at end of file diff --git a/app/code/local/Tribook/Blog/sql/tribook_blog_setup/install-0.1.0.php b/app/code/local/Tribook/Blog/sql/tribook_blog_setup/install-0.1.0.php index 43ed74f..4233ec8 100644 --- a/app/code/local/Tribook/Blog/sql/tribook_blog_setup/install-0.1.0.php +++ b/app/code/local/Tribook/Blog/sql/tribook_blog_setup/install-0.1.0.php @@ -1,24 +1,26 @@ startSetup(); -/* +/** * Create all entity tables */ $installer->createEntityTables( - $this->getTable('tribook_blog/post_entity') + $this->getTable(Tribook_Blog_Helper_Config::ENTITY_TABLE_POST) ); - -/* +/** * Add Entity type */ -$installer->addEntityType('tribook_blog_post', Array( - 'entity_model' => 'tribook_blog/post', - 'attribute_model' =>'', - 'table' =>'tribook_blog/post_entity', - 'increment_model' =>'', - 'increment_per_store' =>'0' -)); - +$installer->addEntityType(Tribook_Blog_Helper_Config::ENTITY_TYPE_CODE_POST, [ + 'entity_model' => Tribook_Blog_Helper_Config::ENTITY_MODEL_POST, + 'attribute_model' => '', + 'table' => Tribook_Blog_Helper_Config::ENTITY_TABLE_POST, + 'increment_model' => '', + 'increment_per_store' => '0' + ] +); +/** + * install Entities with method getDefaultEntities that is in Tribook_Blog_Model_Resource_Setup + */ $installer->installEntities(); - $installer->endSetup(); \ No newline at end of file diff --git a/app/code/local/Tribook/Blog/sql/tribook_blog_setup/upgrade-0.1.0-0.1.1.php b/app/code/local/Tribook/Blog/sql/tribook_blog_setup/upgrade-0.1.0-0.1.1.php index 2e69e21..5fc9fed 100644 --- a/app/code/local/Tribook/Blog/sql/tribook_blog_setup/upgrade-0.1.0-0.1.1.php +++ b/app/code/local/Tribook/Blog/sql/tribook_blog_setup/upgrade-0.1.0-0.1.1.php @@ -1,8 +1,10 @@ startSetup(); - -$installer->addAttribute('tribook_blog_post', 'enable', array( +/** + * Adding new attribute "enable" + */ +$installer->addAttribute(Tribook_Blog_Helper_Config::ENTITY_TYPE_CODE_POST , 'enable', [ 'type' => 'int', 'label' => 'enable', 'input' => 'boolean', @@ -18,9 +20,12 @@ 'comparable' => false, 'visible_on_front' => true, 'unique' => false, - ) + ] ); -$installer->addAttribute('tribook_blog_post', 'description', array( +/** + * Adding new attribute "description" + */ +$installer->addAttribute(Tribook_Blog_Helper_Config::ENTITY_TYPE_CODE_POST , 'description', [ 'type' => 'varchar', 'label' => 'description', 'input' => 'text', @@ -36,6 +41,6 @@ 'comparable' => false, 'visible_on_front' => true, 'unique' => false, - ) + ] ); $installer -> endSetup(); \ No newline at end of file diff --git a/app/etc/modules/TbBlog.xml b/app/etc/modules/TbBlog.xml new file mode 100644 index 0000000..10dd1f8 --- /dev/null +++ b/app/etc/modules/TbBlog.xml @@ -0,0 +1,9 @@ + + + + + true + local + + + From 82ece8038185d7b9ccfd90fe1d53a07eccde7334 Mon Sep 17 00:00:00 2001 From: "Franco.vitelli" Date: Thu, 28 Mar 2019 10:10:58 +0100 Subject: [PATCH 02/19] code style fixed --- app/code/local/Triboo/Blog/Helper/Config.php | 23 ++++ app/code/local/Triboo/Blog/Helper/Data.php | 35 +++++ app/code/local/Triboo/Blog/Model/Post.php | 16 +++ .../local/Triboo/Blog/Model/Resource/Post.php | 36 +++++ .../Blog/Model/Resource/Post/Collection.php | 16 +++ .../Triboo/Blog/Model/Resource/Setup.php | 63 +++++++++ .../Blog/controllers/IndexController.php | 50 +++++++ app/code/local/Triboo/Blog/etc/adminhtml.xml | 22 +++ app/code/local/Triboo/Blog/etc/config.xml | 84 +++++++++++ app/code/local/Triboo/Blog/etc/system.xml | 40 ++++++ .../Blog/sql/tbblog_setup/install-0.1.0.php | 26 ++++ .../sql/tbblog_setup/upgrade-0.1.0-0.1.1.php | 130 ++++++++++++++++++ .../modules/{TbBlog.xml => Triboo_Blog.xml} | 0 app/etc/modules/Tribook_Blog.xml | 9 -- 14 files changed, 541 insertions(+), 9 deletions(-) create mode 100644 app/code/local/Triboo/Blog/Helper/Config.php create mode 100644 app/code/local/Triboo/Blog/Helper/Data.php create mode 100644 app/code/local/Triboo/Blog/Model/Post.php create mode 100644 app/code/local/Triboo/Blog/Model/Resource/Post.php create mode 100644 app/code/local/Triboo/Blog/Model/Resource/Post/Collection.php create mode 100644 app/code/local/Triboo/Blog/Model/Resource/Setup.php create mode 100644 app/code/local/Triboo/Blog/controllers/IndexController.php create mode 100644 app/code/local/Triboo/Blog/etc/adminhtml.xml create mode 100644 app/code/local/Triboo/Blog/etc/config.xml create mode 100644 app/code/local/Triboo/Blog/etc/system.xml create mode 100644 app/code/local/Triboo/Blog/sql/tbblog_setup/install-0.1.0.php create mode 100644 app/code/local/Triboo/Blog/sql/tbblog_setup/upgrade-0.1.0-0.1.1.php rename app/etc/modules/{TbBlog.xml => Triboo_Blog.xml} (100%) delete mode 100644 app/etc/modules/Tribook_Blog.xml diff --git a/app/code/local/Triboo/Blog/Helper/Config.php b/app/code/local/Triboo/Blog/Helper/Config.php new file mode 100644 index 0000000..2e938b6 --- /dev/null +++ b/app/code/local/Triboo/Blog/Helper/Config.php @@ -0,0 +1,23 @@ +isLogEnable = Mage::getStoreConfig(Triboo_Blog_Helper_Config::LOG_ENABLE_CONFIG) ?: false; + } + /** + * @var $message + * @return string + */ + public function log($message) : string + { + if ($this->isLogEnable) + { + Mage::log($message, null, self::LOG_FILE); + } + return $message; + } +} \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/Model/Post.php b/app/code/local/Triboo/Blog/Model/Post.php new file mode 100644 index 0000000..5e7d64e --- /dev/null +++ b/app/code/local/Triboo/Blog/Model/Post.php @@ -0,0 +1,16 @@ +_init('tbblog/post'); + } +} \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/Model/Resource/Post.php b/app/code/local/Triboo/Blog/Model/Resource/Post.php new file mode 100644 index 0000000..cecb664 --- /dev/null +++ b/app/code/local/Triboo/Blog/Model/Resource/Post.php @@ -0,0 +1,36 @@ +setType(Triboo_Blog_Helper_Config::ENTITY_TYPE_CODE_POST); + $this->setConnection( + $resource->getConnection(Triboo_Blog_Helper_Config::CONNECTION_READ), + $resource->getConnection(Triboo_Blog_Helper_Config::CONNECTION_WRITE) + ); + } + /** + * Triboo_Blog_Model_Resource_Post getDefaultAttributes. + * @return array + */ + protected function __getDefaultAttributes() + { + return [ + 'entity_type_id', + 'attribute_set_id', + 'created_at', + 'updated_at', + 'increment_id', + 'store_id', + ]; + } +} \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/Model/Resource/Post/Collection.php b/app/code/local/Triboo/Blog/Model/Resource/Post/Collection.php new file mode 100644 index 0000000..150ec31 --- /dev/null +++ b/app/code/local/Triboo/Blog/Model/Resource/Post/Collection.php @@ -0,0 +1,16 @@ +_init('tbblog/post'); + } +} \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/Model/Resource/Setup.php b/app/code/local/Triboo/Blog/Model/Resource/Setup.php new file mode 100644 index 0000000..d02b721 --- /dev/null +++ b/app/code/local/Triboo/Blog/Model/Resource/Setup.php @@ -0,0 +1,63 @@ + [ + 'entity_model' => Triboo_Blog_Helper_Config::ENTITY_MODEL_POST, + 'attribute_model' => '', + 'table' => Triboo_Blog_Helper_Config::ENTITY_TABLE_POST, + 'attributes' => [ + 'title' => [ + 'type' => 'varchar', + 'backend' => '', + 'frontend' => '', + 'label' => 'Title', + 'input' => 'text', + 'class' => '', + 'source' => '', + 'global' => 0, + 'visible' => true, + 'required' => true, + 'user_defined' => true, + 'default' => '', + 'searchable' => false, + 'filterable' => false, + 'comparable' => false, + 'visible_on_front' => true, + 'unique' => false, + ], + 'author' => [ + 'type' => 'varchar', + 'label' => 'Author', + 'input' => 'text', + 'class' => '', + 'source' => '', + 'global' => 0, + 'visible' => true, + 'required' => true, + 'user_defined' => true, + 'default' => '', + 'searchable' => false, + 'filterable' => false, + 'comparable' => false, + 'visible_on_front' => true, + 'unique' => false, + ] + ] + ] + ]; + + return $entities; + } +} \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/controllers/IndexController.php b/app/code/local/Triboo/Blog/controllers/IndexController.php new file mode 100644 index 0000000..b0215d6 --- /dev/null +++ b/app/code/local/Triboo/Blog/controllers/IndexController.php @@ -0,0 +1,50 @@ +setTitle('Test title'); + $post->setAuthor('Zoran Šalamun'); + $post->setDescription('This is a description'); + $post->setEnable(1); + $post->save(); + + + /* + * Getting posts collection + * -also load collection + * -this will load all post entries but without attributes + * -loaded data is only from tribook_blog_post_entity table + */ + $posts = Mage::getModel('tribook_blog/post')->getCollection(); + $posts->load(); + var_dump($posts); + + /* + * Getting post collection + * -load all posts + * -set attributes to be in collection data + */ + $posts = Mage::getModel('tribook_blog/post')->getCollection() + ->addAttributeToSelect('title') + ->addAttributeToSelect('author') + ->addAttributeToSelect('description') + ->addAttributeToSelect('enable'); + $posts->load(); + var_dump($posts); + + /* + * Load signle post + * -loading single post will get all attributes that we have set for post + */ + $post = Mage::getModel('tribook_blog/post')->load(1); + var_dump($post); + } +} \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/etc/adminhtml.xml b/app/code/local/Triboo/Blog/etc/adminhtml.xml new file mode 100644 index 0000000..3260049 --- /dev/null +++ b/app/code/local/Triboo/Blog/etc/adminhtml.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + Triboo + + + + + + + + + + \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/etc/config.xml b/app/code/local/Triboo/Blog/etc/config.xml new file mode 100644 index 0000000..287990f --- /dev/null +++ b/app/code/local/Triboo/Blog/etc/config.xml @@ -0,0 +1,84 @@ + + + + + 0.1.1 + + + + + + Triboo_Blog_Block + + + + + Triboo_Blog_Helper + + + + + Triboo_Blog_Model + triboo_blog_resource + + + Triboo_Blog_Model_Resource + + + tbblog_post_entity
+
+ + tbblog_post_entity_datetime
+
+ + tbblog_post_entity_decimal
+
+ + tbblog_post_entity_int
+
+ + tbblog_post_entity_text
+
+ + tbblog_post_entity_varchar
+
+ + tbblog_post_entity_char
+
+
+
+
+ + + + Triboo_Blog + Triboo_Blog_Model_Resource_Setup + + + core_setup + + + + + core_write + + + + + core_read + + + +
+ + + + standard + + Triboo_Blog + blog + + + + +
\ No newline at end of file diff --git a/app/code/local/Triboo/Blog/etc/system.xml b/app/code/local/Triboo/Blog/etc/system.xml new file mode 100644 index 0000000..acd59ef --- /dev/null +++ b/app/code/local/Triboo/Blog/etc/system.xml @@ -0,0 +1,40 @@ + + + + + + 99999 + + + + + + tb_tab + 1000 + 1 + 1 + 1 + + + + text + 1 + 1 + 1 + 1 + + + + select + adminhtml/system_config_source_yesno + 1 + 1 + 1 + 1 + + + + + + + \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/sql/tbblog_setup/install-0.1.0.php b/app/code/local/Triboo/Blog/sql/tbblog_setup/install-0.1.0.php new file mode 100644 index 0000000..2443fa7 --- /dev/null +++ b/app/code/local/Triboo/Blog/sql/tbblog_setup/install-0.1.0.php @@ -0,0 +1,26 @@ +startSetup(); +/** + * Create all entity tables + */ +$installer->createEntityTables( + $this->getTable(Triboo_Blog_Helper_Config::ENTITY_TABLE_POST) +); +/** + * Add Entity type + */ +$installer->addEntityType(Triboo_Blog_Helper_Config::ENTITY_TYPE_CODE_POST, [ + 'entity_model' => Triboo_Blog_Helper_Config::ENTITY_MODEL_POST, + 'attribute_model' => '', + 'table' => Triboo_Blog_Helper_Config::ENTITY_TABLE_POST, + 'increment_model' => '', + 'increment_per_store' => '0' + ] +); +/** + * install Entities with method getDefaultEntities that is in Triboo_Blog_Model_Resource_Setup + */ +$installer->installEntities(); +$installer->endSetup(); \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/sql/tbblog_setup/upgrade-0.1.0-0.1.1.php b/app/code/local/Triboo/Blog/sql/tbblog_setup/upgrade-0.1.0-0.1.1.php new file mode 100644 index 0000000..c013b3c --- /dev/null +++ b/app/code/local/Triboo/Blog/sql/tbblog_setup/upgrade-0.1.0-0.1.1.php @@ -0,0 +1,130 @@ +startSetup(); +/** + * Adding new attribute "created_at" + */ +$installer->addAttribute(Triboo_Blog_Helper_Config::ENTITY_TYPE_CODE_POST , 'created_at', [ + 'type' => 'datetime', + 'label' => 'created_at', + 'input' => 'date', + 'class' => '', + 'source' => '', + 'global' => 0, + 'visible' => true, + 'required' => true, + 'user_defined' => true, + 'default' => '', + 'searchable' => false, + 'filterable' => false, + 'comparable' => false, + 'visible_on_front' => true, + 'unique' => false, + ] +); +/** + * Adding new attribute "updated_at" + */ +$installer->addAttribute(Triboo_Blog_Helper_Config::ENTITY_TYPE_CODE_POST , 'updated_at', [ + 'type' => 'datetime', + 'label' => 'updated_at', + 'input' => 'date', + 'class' => '', + 'source' => '', + 'global' => 0, + 'visible' => true, + 'required' => true, + 'user_defined' => true, + 'default' => '0', + 'searchable' => false, + 'filterable' => false, + 'comparable' => false, + 'visible_on_front' => true, + 'unique' => false, + ] +); +/** + * Adding new attribute "enable" + */ +$installer->addAttribute(Triboo_Blog_Helper_Config::ENTITY_TYPE_CODE_POST , 'enable', [ + 'type' => 'int', + 'label' => 'enable', + 'input' => 'boolean', + 'class' => '', + 'source' => '', + 'global' => 0, + 'visible' => true, + 'required' => true, + 'user_defined' => true, + 'default' => '0', + 'searchable' => false, + 'filterable' => false, + 'comparable' => false, + 'visible_on_front' => true, + 'unique' => false, + ] +); +/** + * Adding new attribute "post_image" + */ +$installer->addAttribute(Triboo_Blog_Helper_Config::ENTITY_TYPE_CODE_POST , 'post_image', [ + 'type' => 'varchar', + 'label' => 'post_image', + 'input' => 'media_image', + 'class' => '', + 'source' => '', + 'global' => 0, + 'visible' => true, + 'required' => true, + 'user_defined' => true, + 'default' => '', + 'searchable' => false, + 'filterable' => false, + 'comparable' => false, + 'visible_on_front' => true, + 'unique' => false, + ] +); +/** + * Adding new attribute "description" + */ +$installer->addAttribute(Triboo_Blog_Helper_Config::ENTITY_TYPE_CODE_POST , 'description', [ + 'type' => 'varchar', + 'label' => 'description', + 'input' => 'text', + 'class' => '', + 'source' => '', + 'global' => 0, + 'visible' => true, + 'required' => true, + 'user_defined' => true, + 'default' => '', + 'searchable' => false, + 'filterable' => false, + 'comparable' => false, + 'visible_on_front' => true, + 'unique' => false, + ] +); +/** + * Adding new attribute "short_description" + */ +$installer->addAttribute(Triboo_Blog_Helper_Config::ENTITY_TYPE_CODE_POST , 'short_description', [ + 'type' => 'varchar', + 'label' => 'description', + 'input' => 'text', + 'class' => '', + 'source' => '', + 'global' => 0, + 'visible' => true, + 'required' => true, + 'user_defined' => true, + 'default' => '', + 'searchable' => false, + 'filterable' => false, + 'comparable' => false, + 'visible_on_front' => true, + 'unique' => false, + ] +); +$installer -> endSetup(); \ No newline at end of file diff --git a/app/etc/modules/TbBlog.xml b/app/etc/modules/Triboo_Blog.xml similarity index 100% rename from app/etc/modules/TbBlog.xml rename to app/etc/modules/Triboo_Blog.xml diff --git a/app/etc/modules/Tribook_Blog.xml b/app/etc/modules/Tribook_Blog.xml deleted file mode 100644 index 86af67f..0000000 --- a/app/etc/modules/Tribook_Blog.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - true - local - - - From 0e2770122efdce273564092d2bfbb7796706c568 Mon Sep 17 00:00:00 2001 From: "Franco.vitelli" Date: Thu, 28 Mar 2019 10:25:54 +0100 Subject: [PATCH 03/19] Remove Duplicate dir --- app/code/local/Triboo/Blog/Helper/Config.php | 23 ---- app/code/local/Triboo/Blog/Helper/Data.php | 35 ----- app/code/local/Triboo/Blog/Model/Post.php | 16 --- .../local/Triboo/Blog/Model/Resource/Post.php | 36 ----- .../Blog/Model/Resource/Post/Collection.php | 16 --- .../Triboo/Blog/Model/Resource/Setup.php | 63 --------- .../Blog/controllers/IndexController.php | 50 ------- app/code/local/Triboo/Blog/etc/adminhtml.xml | 22 --- app/code/local/Triboo/Blog/etc/config.xml | 84 ----------- app/code/local/Triboo/Blog/etc/system.xml | 40 ------ .../Blog/sql/tbblog_setup/install-0.1.0.php | 26 ---- .../sql/tbblog_setup/upgrade-0.1.0-0.1.1.php | 130 ------------------ app/code/local/Tribook/Blog/Helper/Config.php | 23 ---- app/code/local/Tribook/Blog/Helper/Data.php | 35 ----- app/code/local/Tribook/Blog/Model/Post.php | 16 --- .../Tribook/Blog/Model/Resource/Post.php | 36 ----- .../Blog/Model/Resource/Post/Collection.php | 16 --- .../Tribook/Blog/Model/Resource/Setup.php | 63 --------- .../Blog/controllers/IndexController.php | 50 ------- app/code/local/Tribook/Blog/etc/adminhtml.xml | 22 --- app/code/local/Tribook/Blog/etc/config.xml | 84 ----------- app/code/local/Tribook/Blog/etc/system.xml | 40 ------ .../sql/tribook_blog_setup/install-0.1.0.php | 26 ---- .../upgrade-0.1.0-0.1.1.php | 46 ------- 24 files changed, 998 deletions(-) delete mode 100644 app/code/local/Triboo/Blog/Helper/Config.php delete mode 100644 app/code/local/Triboo/Blog/Helper/Data.php delete mode 100644 app/code/local/Triboo/Blog/Model/Post.php delete mode 100644 app/code/local/Triboo/Blog/Model/Resource/Post.php delete mode 100644 app/code/local/Triboo/Blog/Model/Resource/Post/Collection.php delete mode 100644 app/code/local/Triboo/Blog/Model/Resource/Setup.php delete mode 100644 app/code/local/Triboo/Blog/controllers/IndexController.php delete mode 100644 app/code/local/Triboo/Blog/etc/adminhtml.xml delete mode 100644 app/code/local/Triboo/Blog/etc/config.xml delete mode 100644 app/code/local/Triboo/Blog/etc/system.xml delete mode 100644 app/code/local/Triboo/Blog/sql/tbblog_setup/install-0.1.0.php delete mode 100644 app/code/local/Triboo/Blog/sql/tbblog_setup/upgrade-0.1.0-0.1.1.php delete mode 100644 app/code/local/Tribook/Blog/Helper/Config.php delete mode 100644 app/code/local/Tribook/Blog/Helper/Data.php delete mode 100644 app/code/local/Tribook/Blog/Model/Post.php delete mode 100644 app/code/local/Tribook/Blog/Model/Resource/Post.php delete mode 100644 app/code/local/Tribook/Blog/Model/Resource/Post/Collection.php delete mode 100644 app/code/local/Tribook/Blog/Model/Resource/Setup.php delete mode 100644 app/code/local/Tribook/Blog/controllers/IndexController.php delete mode 100644 app/code/local/Tribook/Blog/etc/adminhtml.xml delete mode 100644 app/code/local/Tribook/Blog/etc/config.xml delete mode 100644 app/code/local/Tribook/Blog/etc/system.xml delete mode 100644 app/code/local/Tribook/Blog/sql/tribook_blog_setup/install-0.1.0.php delete mode 100644 app/code/local/Tribook/Blog/sql/tribook_blog_setup/upgrade-0.1.0-0.1.1.php diff --git a/app/code/local/Triboo/Blog/Helper/Config.php b/app/code/local/Triboo/Blog/Helper/Config.php deleted file mode 100644 index 2e938b6..0000000 --- a/app/code/local/Triboo/Blog/Helper/Config.php +++ /dev/null @@ -1,23 +0,0 @@ -isLogEnable = Mage::getStoreConfig(Triboo_Blog_Helper_Config::LOG_ENABLE_CONFIG) ?: false; - } - /** - * @var $message - * @return string - */ - public function log($message) : string - { - if ($this->isLogEnable) - { - Mage::log($message, null, self::LOG_FILE); - } - return $message; - } -} \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/Model/Post.php b/app/code/local/Triboo/Blog/Model/Post.php deleted file mode 100644 index 5e7d64e..0000000 --- a/app/code/local/Triboo/Blog/Model/Post.php +++ /dev/null @@ -1,16 +0,0 @@ -_init('tbblog/post'); - } -} \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/Model/Resource/Post.php b/app/code/local/Triboo/Blog/Model/Resource/Post.php deleted file mode 100644 index cecb664..0000000 --- a/app/code/local/Triboo/Blog/Model/Resource/Post.php +++ /dev/null @@ -1,36 +0,0 @@ -setType(Triboo_Blog_Helper_Config::ENTITY_TYPE_CODE_POST); - $this->setConnection( - $resource->getConnection(Triboo_Blog_Helper_Config::CONNECTION_READ), - $resource->getConnection(Triboo_Blog_Helper_Config::CONNECTION_WRITE) - ); - } - /** - * Triboo_Blog_Model_Resource_Post getDefaultAttributes. - * @return array - */ - protected function __getDefaultAttributes() - { - return [ - 'entity_type_id', - 'attribute_set_id', - 'created_at', - 'updated_at', - 'increment_id', - 'store_id', - ]; - } -} \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/Model/Resource/Post/Collection.php b/app/code/local/Triboo/Blog/Model/Resource/Post/Collection.php deleted file mode 100644 index 150ec31..0000000 --- a/app/code/local/Triboo/Blog/Model/Resource/Post/Collection.php +++ /dev/null @@ -1,16 +0,0 @@ -_init('tbblog/post'); - } -} \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/Model/Resource/Setup.php b/app/code/local/Triboo/Blog/Model/Resource/Setup.php deleted file mode 100644 index d02b721..0000000 --- a/app/code/local/Triboo/Blog/Model/Resource/Setup.php +++ /dev/null @@ -1,63 +0,0 @@ - [ - 'entity_model' => Triboo_Blog_Helper_Config::ENTITY_MODEL_POST, - 'attribute_model' => '', - 'table' => Triboo_Blog_Helper_Config::ENTITY_TABLE_POST, - 'attributes' => [ - 'title' => [ - 'type' => 'varchar', - 'backend' => '', - 'frontend' => '', - 'label' => 'Title', - 'input' => 'text', - 'class' => '', - 'source' => '', - 'global' => 0, - 'visible' => true, - 'required' => true, - 'user_defined' => true, - 'default' => '', - 'searchable' => false, - 'filterable' => false, - 'comparable' => false, - 'visible_on_front' => true, - 'unique' => false, - ], - 'author' => [ - 'type' => 'varchar', - 'label' => 'Author', - 'input' => 'text', - 'class' => '', - 'source' => '', - 'global' => 0, - 'visible' => true, - 'required' => true, - 'user_defined' => true, - 'default' => '', - 'searchable' => false, - 'filterable' => false, - 'comparable' => false, - 'visible_on_front' => true, - 'unique' => false, - ] - ] - ] - ]; - - return $entities; - } -} \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/controllers/IndexController.php b/app/code/local/Triboo/Blog/controllers/IndexController.php deleted file mode 100644 index b0215d6..0000000 --- a/app/code/local/Triboo/Blog/controllers/IndexController.php +++ /dev/null @@ -1,50 +0,0 @@ -setTitle('Test title'); - $post->setAuthor('Zoran Šalamun'); - $post->setDescription('This is a description'); - $post->setEnable(1); - $post->save(); - - - /* - * Getting posts collection - * -also load collection - * -this will load all post entries but without attributes - * -loaded data is only from tribook_blog_post_entity table - */ - $posts = Mage::getModel('tribook_blog/post')->getCollection(); - $posts->load(); - var_dump($posts); - - /* - * Getting post collection - * -load all posts - * -set attributes to be in collection data - */ - $posts = Mage::getModel('tribook_blog/post')->getCollection() - ->addAttributeToSelect('title') - ->addAttributeToSelect('author') - ->addAttributeToSelect('description') - ->addAttributeToSelect('enable'); - $posts->load(); - var_dump($posts); - - /* - * Load signle post - * -loading single post will get all attributes that we have set for post - */ - $post = Mage::getModel('tribook_blog/post')->load(1); - var_dump($post); - } -} \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/etc/adminhtml.xml b/app/code/local/Triboo/Blog/etc/adminhtml.xml deleted file mode 100644 index 3260049..0000000 --- a/app/code/local/Triboo/Blog/etc/adminhtml.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - Triboo - - - - - - - - - - \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/etc/config.xml b/app/code/local/Triboo/Blog/etc/config.xml deleted file mode 100644 index 287990f..0000000 --- a/app/code/local/Triboo/Blog/etc/config.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - 0.1.1 - - - - - - Triboo_Blog_Block - - - - - Triboo_Blog_Helper - - - - - Triboo_Blog_Model - triboo_blog_resource - - - Triboo_Blog_Model_Resource - - - tbblog_post_entity
-
- - tbblog_post_entity_datetime
-
- - tbblog_post_entity_decimal
-
- - tbblog_post_entity_int
-
- - tbblog_post_entity_text
-
- - tbblog_post_entity_varchar
-
- - tbblog_post_entity_char
-
-
-
-
- - - - Triboo_Blog - Triboo_Blog_Model_Resource_Setup - - - core_setup - - - - - core_write - - - - - core_read - - - -
- - - - standard - - Triboo_Blog - blog - - - - -
\ No newline at end of file diff --git a/app/code/local/Triboo/Blog/etc/system.xml b/app/code/local/Triboo/Blog/etc/system.xml deleted file mode 100644 index acd59ef..0000000 --- a/app/code/local/Triboo/Blog/etc/system.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - 99999 - - - - - - tb_tab - 1000 - 1 - 1 - 1 - - - - text - 1 - 1 - 1 - 1 - - - - select - adminhtml/system_config_source_yesno - 1 - 1 - 1 - 1 - - - - - - - \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/sql/tbblog_setup/install-0.1.0.php b/app/code/local/Triboo/Blog/sql/tbblog_setup/install-0.1.0.php deleted file mode 100644 index 2443fa7..0000000 --- a/app/code/local/Triboo/Blog/sql/tbblog_setup/install-0.1.0.php +++ /dev/null @@ -1,26 +0,0 @@ -startSetup(); -/** - * Create all entity tables - */ -$installer->createEntityTables( - $this->getTable(Triboo_Blog_Helper_Config::ENTITY_TABLE_POST) -); -/** - * Add Entity type - */ -$installer->addEntityType(Triboo_Blog_Helper_Config::ENTITY_TYPE_CODE_POST, [ - 'entity_model' => Triboo_Blog_Helper_Config::ENTITY_MODEL_POST, - 'attribute_model' => '', - 'table' => Triboo_Blog_Helper_Config::ENTITY_TABLE_POST, - 'increment_model' => '', - 'increment_per_store' => '0' - ] -); -/** - * install Entities with method getDefaultEntities that is in Triboo_Blog_Model_Resource_Setup - */ -$installer->installEntities(); -$installer->endSetup(); \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/sql/tbblog_setup/upgrade-0.1.0-0.1.1.php b/app/code/local/Triboo/Blog/sql/tbblog_setup/upgrade-0.1.0-0.1.1.php deleted file mode 100644 index c013b3c..0000000 --- a/app/code/local/Triboo/Blog/sql/tbblog_setup/upgrade-0.1.0-0.1.1.php +++ /dev/null @@ -1,130 +0,0 @@ -startSetup(); -/** - * Adding new attribute "created_at" - */ -$installer->addAttribute(Triboo_Blog_Helper_Config::ENTITY_TYPE_CODE_POST , 'created_at', [ - 'type' => 'datetime', - 'label' => 'created_at', - 'input' => 'date', - 'class' => '', - 'source' => '', - 'global' => 0, - 'visible' => true, - 'required' => true, - 'user_defined' => true, - 'default' => '', - 'searchable' => false, - 'filterable' => false, - 'comparable' => false, - 'visible_on_front' => true, - 'unique' => false, - ] -); -/** - * Adding new attribute "updated_at" - */ -$installer->addAttribute(Triboo_Blog_Helper_Config::ENTITY_TYPE_CODE_POST , 'updated_at', [ - 'type' => 'datetime', - 'label' => 'updated_at', - 'input' => 'date', - 'class' => '', - 'source' => '', - 'global' => 0, - 'visible' => true, - 'required' => true, - 'user_defined' => true, - 'default' => '0', - 'searchable' => false, - 'filterable' => false, - 'comparable' => false, - 'visible_on_front' => true, - 'unique' => false, - ] -); -/** - * Adding new attribute "enable" - */ -$installer->addAttribute(Triboo_Blog_Helper_Config::ENTITY_TYPE_CODE_POST , 'enable', [ - 'type' => 'int', - 'label' => 'enable', - 'input' => 'boolean', - 'class' => '', - 'source' => '', - 'global' => 0, - 'visible' => true, - 'required' => true, - 'user_defined' => true, - 'default' => '0', - 'searchable' => false, - 'filterable' => false, - 'comparable' => false, - 'visible_on_front' => true, - 'unique' => false, - ] -); -/** - * Adding new attribute "post_image" - */ -$installer->addAttribute(Triboo_Blog_Helper_Config::ENTITY_TYPE_CODE_POST , 'post_image', [ - 'type' => 'varchar', - 'label' => 'post_image', - 'input' => 'media_image', - 'class' => '', - 'source' => '', - 'global' => 0, - 'visible' => true, - 'required' => true, - 'user_defined' => true, - 'default' => '', - 'searchable' => false, - 'filterable' => false, - 'comparable' => false, - 'visible_on_front' => true, - 'unique' => false, - ] -); -/** - * Adding new attribute "description" - */ -$installer->addAttribute(Triboo_Blog_Helper_Config::ENTITY_TYPE_CODE_POST , 'description', [ - 'type' => 'varchar', - 'label' => 'description', - 'input' => 'text', - 'class' => '', - 'source' => '', - 'global' => 0, - 'visible' => true, - 'required' => true, - 'user_defined' => true, - 'default' => '', - 'searchable' => false, - 'filterable' => false, - 'comparable' => false, - 'visible_on_front' => true, - 'unique' => false, - ] -); -/** - * Adding new attribute "short_description" - */ -$installer->addAttribute(Triboo_Blog_Helper_Config::ENTITY_TYPE_CODE_POST , 'short_description', [ - 'type' => 'varchar', - 'label' => 'description', - 'input' => 'text', - 'class' => '', - 'source' => '', - 'global' => 0, - 'visible' => true, - 'required' => true, - 'user_defined' => true, - 'default' => '', - 'searchable' => false, - 'filterable' => false, - 'comparable' => false, - 'visible_on_front' => true, - 'unique' => false, - ] -); -$installer -> endSetup(); \ No newline at end of file diff --git a/app/code/local/Tribook/Blog/Helper/Config.php b/app/code/local/Tribook/Blog/Helper/Config.php deleted file mode 100644 index 0edb3a5..0000000 --- a/app/code/local/Tribook/Blog/Helper/Config.php +++ /dev/null @@ -1,23 +0,0 @@ -isLogEnable = Mage::getStoreConfig(Tribook_Blog_Helper_Config::LOG_ENABLE_CONFIG) ?: false; - } - /** - * @var $message - * @return string - */ - public function log($message) - { - if ($this->isLogEnable) - { - Mage::log($message, null, self::LOG_FILE); - } - return $message; - } -} \ No newline at end of file diff --git a/app/code/local/Tribook/Blog/Model/Post.php b/app/code/local/Tribook/Blog/Model/Post.php deleted file mode 100644 index 26caa20..0000000 --- a/app/code/local/Tribook/Blog/Model/Post.php +++ /dev/null @@ -1,16 +0,0 @@ -_init('tribook_blog/post'); - } -} \ No newline at end of file diff --git a/app/code/local/Tribook/Blog/Model/Resource/Post.php b/app/code/local/Tribook/Blog/Model/Resource/Post.php deleted file mode 100644 index ef28b7b..0000000 --- a/app/code/local/Tribook/Blog/Model/Resource/Post.php +++ /dev/null @@ -1,36 +0,0 @@ -setType(Tribook_Blog_Helper_Config::ENTITY_TYPE_CODE_POST); - $this->setConnection( - $resource->getConnection(Tribook_Blog_Helper_Config::CONNECTION_READ), - $resource->getConnection(Tribook_Blog_Helper_Config::CONNECTION_WRITE) - ); - } - /** - * Tribook_Blog_Model_Resource_Post getDefaultAttributes. - * @return array - */ - protected function __getDefaultAttributes() - { - return [ - 'entity_type_id', - 'attribute_set_id', - 'created_at', - 'updated_at', - 'increment_id', - 'store_id', - ]; - } -} \ No newline at end of file diff --git a/app/code/local/Tribook/Blog/Model/Resource/Post/Collection.php b/app/code/local/Tribook/Blog/Model/Resource/Post/Collection.php deleted file mode 100644 index 9c13f0f..0000000 --- a/app/code/local/Tribook/Blog/Model/Resource/Post/Collection.php +++ /dev/null @@ -1,16 +0,0 @@ -_init('tribook_blog/post'); - } -} \ No newline at end of file diff --git a/app/code/local/Tribook/Blog/Model/Resource/Setup.php b/app/code/local/Tribook/Blog/Model/Resource/Setup.php deleted file mode 100644 index 2517d9b..0000000 --- a/app/code/local/Tribook/Blog/Model/Resource/Setup.php +++ /dev/null @@ -1,63 +0,0 @@ - [ - 'entity_model' => Tribook_Blog_Helper_Config::ENTITY_MODEL_POST, - 'attribute_model' => '', - 'table' => Tribook_Blog_Helper_Config::ENTITY_TABLE_POST, - 'attributes' => [ - 'title' => [ - 'type' => 'varchar', - 'backend' => '', - 'frontend' => '', - 'label' => 'Title', - 'input' => 'text', - 'class' => '', - 'source' => '', - 'global' => 0, - 'visible' => true, - 'required' => true, - 'user_defined' => true, - 'default' => '', - 'searchable' => false, - 'filterable' => false, - 'comparable' => false, - 'visible_on_front' => true, - 'unique' => false, - ], - 'author' => [ - 'type' => 'varchar', - 'label' => 'Author', - 'input' => 'text', - 'class' => '', - 'source' => '', - 'global' => 0, - 'visible' => true, - 'required' => true, - 'user_defined' => true, - 'default' => '', - 'searchable' => false, - 'filterable' => false, - 'comparable' => false, - 'visible_on_front' => true, - 'unique' => false, - ] - ] - ] - ]; - - return $entities; - } -} \ No newline at end of file diff --git a/app/code/local/Tribook/Blog/controllers/IndexController.php b/app/code/local/Tribook/Blog/controllers/IndexController.php deleted file mode 100644 index b0215d6..0000000 --- a/app/code/local/Tribook/Blog/controllers/IndexController.php +++ /dev/null @@ -1,50 +0,0 @@ -setTitle('Test title'); - $post->setAuthor('Zoran Šalamun'); - $post->setDescription('This is a description'); - $post->setEnable(1); - $post->save(); - - - /* - * Getting posts collection - * -also load collection - * -this will load all post entries but without attributes - * -loaded data is only from tribook_blog_post_entity table - */ - $posts = Mage::getModel('tribook_blog/post')->getCollection(); - $posts->load(); - var_dump($posts); - - /* - * Getting post collection - * -load all posts - * -set attributes to be in collection data - */ - $posts = Mage::getModel('tribook_blog/post')->getCollection() - ->addAttributeToSelect('title') - ->addAttributeToSelect('author') - ->addAttributeToSelect('description') - ->addAttributeToSelect('enable'); - $posts->load(); - var_dump($posts); - - /* - * Load signle post - * -loading single post will get all attributes that we have set for post - */ - $post = Mage::getModel('tribook_blog/post')->load(1); - var_dump($post); - } -} \ No newline at end of file diff --git a/app/code/local/Tribook/Blog/etc/adminhtml.xml b/app/code/local/Tribook/Blog/etc/adminhtml.xml deleted file mode 100644 index 438fbf8..0000000 --- a/app/code/local/Tribook/Blog/etc/adminhtml.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - Tribook - - - - - - - - - - \ No newline at end of file diff --git a/app/code/local/Tribook/Blog/etc/config.xml b/app/code/local/Tribook/Blog/etc/config.xml deleted file mode 100644 index b603b37..0000000 --- a/app/code/local/Tribook/Blog/etc/config.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - 0.1.1 - - - - - - Tribook_Blog_Block - - - - - Tribook_Blog_Helper - - - - - Tribook_Blog_Model - tribook_blog_resource - - - Tribook_Blog_Model_Resource - - - tribook_blog_post_entity
-
- - tribook_blog_post_entity_datetime
-
- - tribook_blog_post_entity_decimal
-
- - tribook_blog_post_entity_int
-
- - tribook_blog_post_entity_text
-
- - tribook_blog_post_entity_varchar
-
- - tribook_blog_post_entity_char
-
-
-
-
- - - - Tribook_Blog - Tribook_Blog_Model_Resource_Setup - - - core_setup - - - - - core_write - - - - - core_read - - - -
- - - - standard - - Tribook_Blog - blog - - - - -
\ No newline at end of file diff --git a/app/code/local/Tribook/Blog/etc/system.xml b/app/code/local/Tribook/Blog/etc/system.xml deleted file mode 100644 index 08a54fd..0000000 --- a/app/code/local/Tribook/Blog/etc/system.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - 99999 - - - - - - tribook_tab - 1000 - 1 - 1 - 1 - - - - text - 1 - 1 - 1 - 1 - - - - select - adminhtml/system_config_source_yesno - 1 - 1 - 1 - 1 - - - - - - - \ No newline at end of file diff --git a/app/code/local/Tribook/Blog/sql/tribook_blog_setup/install-0.1.0.php b/app/code/local/Tribook/Blog/sql/tribook_blog_setup/install-0.1.0.php deleted file mode 100644 index 4233ec8..0000000 --- a/app/code/local/Tribook/Blog/sql/tribook_blog_setup/install-0.1.0.php +++ /dev/null @@ -1,26 +0,0 @@ -startSetup(); -/** - * Create all entity tables - */ -$installer->createEntityTables( - $this->getTable(Tribook_Blog_Helper_Config::ENTITY_TABLE_POST) -); -/** - * Add Entity type - */ -$installer->addEntityType(Tribook_Blog_Helper_Config::ENTITY_TYPE_CODE_POST, [ - 'entity_model' => Tribook_Blog_Helper_Config::ENTITY_MODEL_POST, - 'attribute_model' => '', - 'table' => Tribook_Blog_Helper_Config::ENTITY_TABLE_POST, - 'increment_model' => '', - 'increment_per_store' => '0' - ] -); -/** - * install Entities with method getDefaultEntities that is in Tribook_Blog_Model_Resource_Setup - */ -$installer->installEntities(); -$installer->endSetup(); \ No newline at end of file diff --git a/app/code/local/Tribook/Blog/sql/tribook_blog_setup/upgrade-0.1.0-0.1.1.php b/app/code/local/Tribook/Blog/sql/tribook_blog_setup/upgrade-0.1.0-0.1.1.php deleted file mode 100644 index 5fc9fed..0000000 --- a/app/code/local/Tribook/Blog/sql/tribook_blog_setup/upgrade-0.1.0-0.1.1.php +++ /dev/null @@ -1,46 +0,0 @@ -startSetup(); -/** - * Adding new attribute "enable" - */ -$installer->addAttribute(Tribook_Blog_Helper_Config::ENTITY_TYPE_CODE_POST , 'enable', [ - 'type' => 'int', - 'label' => 'enable', - 'input' => 'boolean', - 'class' => '', - 'source' => '', - 'global' => 0, - 'visible' => true, - 'required' => true, - 'user_defined' => true, - 'default' => '0', - 'searchable' => false, - 'filterable' => false, - 'comparable' => false, - 'visible_on_front' => true, - 'unique' => false, - ] -); -/** - * Adding new attribute "description" - */ -$installer->addAttribute(Tribook_Blog_Helper_Config::ENTITY_TYPE_CODE_POST , 'description', [ - 'type' => 'varchar', - 'label' => 'description', - 'input' => 'text', - 'class' => '', - 'source' => '', - 'global' => 0, - 'visible' => true, - 'required' => true, - 'user_defined' => true, - 'default' => '0', - 'searchable' => false, - 'filterable' => false, - 'comparable' => false, - 'visible_on_front' => true, - 'unique' => false, - ] -); -$installer -> endSetup(); \ No newline at end of file From c0a1557b617b2a6aec6cb978fba41c85aacf845d Mon Sep 17 00:00:00 2001 From: "Franco.vitelli" Date: Thu, 28 Mar 2019 10:27:14 +0100 Subject: [PATCH 04/19] fixed code style --- app/code/local/Triboo/Blog/Helper/Config.php | 23 ++++ app/code/local/Triboo/Blog/Helper/Data.php | 35 +++++ app/code/local/Triboo/Blog/Model/Post.php | 16 +++ .../local/Triboo/Blog/Model/Resource/Post.php | 36 +++++ .../Blog/Model/Resource/Post/Collection.php | 16 +++ .../Triboo/Blog/Model/Resource/Setup.php | 63 +++++++++ .../Blog/controllers/IndexController.php | 50 +++++++ app/code/local/Triboo/Blog/etc/adminhtml.xml | 22 +++ app/code/local/Triboo/Blog/etc/config.xml | 84 +++++++++++ app/code/local/Triboo/Blog/etc/system.xml | 40 ++++++ .../Blog/sql/tbblog_setup/install-0.1.0.php | 26 ++++ .../sql/tbblog_setup/upgrade-0.1.0-0.1.1.php | 130 ++++++++++++++++++ 12 files changed, 541 insertions(+) create mode 100644 app/code/local/Triboo/Blog/Helper/Config.php create mode 100644 app/code/local/Triboo/Blog/Helper/Data.php create mode 100644 app/code/local/Triboo/Blog/Model/Post.php create mode 100644 app/code/local/Triboo/Blog/Model/Resource/Post.php create mode 100644 app/code/local/Triboo/Blog/Model/Resource/Post/Collection.php create mode 100644 app/code/local/Triboo/Blog/Model/Resource/Setup.php create mode 100644 app/code/local/Triboo/Blog/controllers/IndexController.php create mode 100644 app/code/local/Triboo/Blog/etc/adminhtml.xml create mode 100644 app/code/local/Triboo/Blog/etc/config.xml create mode 100644 app/code/local/Triboo/Blog/etc/system.xml create mode 100644 app/code/local/Triboo/Blog/sql/tbblog_setup/install-0.1.0.php create mode 100644 app/code/local/Triboo/Blog/sql/tbblog_setup/upgrade-0.1.0-0.1.1.php diff --git a/app/code/local/Triboo/Blog/Helper/Config.php b/app/code/local/Triboo/Blog/Helper/Config.php new file mode 100644 index 0000000..2e938b6 --- /dev/null +++ b/app/code/local/Triboo/Blog/Helper/Config.php @@ -0,0 +1,23 @@ +isLogEnable = Mage::getStoreConfig(Triboo_Blog_Helper_Config::LOG_ENABLE_CONFIG) ?: false; + } + /** + * @var $message + * @return string + */ + public function log($message) : string + { + if ($this->isLogEnable) + { + Mage::log($message, null, self::LOG_FILE); + } + return $message; + } +} \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/Model/Post.php b/app/code/local/Triboo/Blog/Model/Post.php new file mode 100644 index 0000000..5e7d64e --- /dev/null +++ b/app/code/local/Triboo/Blog/Model/Post.php @@ -0,0 +1,16 @@ +_init('tbblog/post'); + } +} \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/Model/Resource/Post.php b/app/code/local/Triboo/Blog/Model/Resource/Post.php new file mode 100644 index 0000000..cecb664 --- /dev/null +++ b/app/code/local/Triboo/Blog/Model/Resource/Post.php @@ -0,0 +1,36 @@ +setType(Triboo_Blog_Helper_Config::ENTITY_TYPE_CODE_POST); + $this->setConnection( + $resource->getConnection(Triboo_Blog_Helper_Config::CONNECTION_READ), + $resource->getConnection(Triboo_Blog_Helper_Config::CONNECTION_WRITE) + ); + } + /** + * Triboo_Blog_Model_Resource_Post getDefaultAttributes. + * @return array + */ + protected function __getDefaultAttributes() + { + return [ + 'entity_type_id', + 'attribute_set_id', + 'created_at', + 'updated_at', + 'increment_id', + 'store_id', + ]; + } +} \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/Model/Resource/Post/Collection.php b/app/code/local/Triboo/Blog/Model/Resource/Post/Collection.php new file mode 100644 index 0000000..150ec31 --- /dev/null +++ b/app/code/local/Triboo/Blog/Model/Resource/Post/Collection.php @@ -0,0 +1,16 @@ +_init('tbblog/post'); + } +} \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/Model/Resource/Setup.php b/app/code/local/Triboo/Blog/Model/Resource/Setup.php new file mode 100644 index 0000000..d02b721 --- /dev/null +++ b/app/code/local/Triboo/Blog/Model/Resource/Setup.php @@ -0,0 +1,63 @@ + [ + 'entity_model' => Triboo_Blog_Helper_Config::ENTITY_MODEL_POST, + 'attribute_model' => '', + 'table' => Triboo_Blog_Helper_Config::ENTITY_TABLE_POST, + 'attributes' => [ + 'title' => [ + 'type' => 'varchar', + 'backend' => '', + 'frontend' => '', + 'label' => 'Title', + 'input' => 'text', + 'class' => '', + 'source' => '', + 'global' => 0, + 'visible' => true, + 'required' => true, + 'user_defined' => true, + 'default' => '', + 'searchable' => false, + 'filterable' => false, + 'comparable' => false, + 'visible_on_front' => true, + 'unique' => false, + ], + 'author' => [ + 'type' => 'varchar', + 'label' => 'Author', + 'input' => 'text', + 'class' => '', + 'source' => '', + 'global' => 0, + 'visible' => true, + 'required' => true, + 'user_defined' => true, + 'default' => '', + 'searchable' => false, + 'filterable' => false, + 'comparable' => false, + 'visible_on_front' => true, + 'unique' => false, + ] + ] + ] + ]; + + return $entities; + } +} \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/controllers/IndexController.php b/app/code/local/Triboo/Blog/controllers/IndexController.php new file mode 100644 index 0000000..b0215d6 --- /dev/null +++ b/app/code/local/Triboo/Blog/controllers/IndexController.php @@ -0,0 +1,50 @@ +setTitle('Test title'); + $post->setAuthor('Zoran Šalamun'); + $post->setDescription('This is a description'); + $post->setEnable(1); + $post->save(); + + + /* + * Getting posts collection + * -also load collection + * -this will load all post entries but without attributes + * -loaded data is only from tribook_blog_post_entity table + */ + $posts = Mage::getModel('tribook_blog/post')->getCollection(); + $posts->load(); + var_dump($posts); + + /* + * Getting post collection + * -load all posts + * -set attributes to be in collection data + */ + $posts = Mage::getModel('tribook_blog/post')->getCollection() + ->addAttributeToSelect('title') + ->addAttributeToSelect('author') + ->addAttributeToSelect('description') + ->addAttributeToSelect('enable'); + $posts->load(); + var_dump($posts); + + /* + * Load signle post + * -loading single post will get all attributes that we have set for post + */ + $post = Mage::getModel('tribook_blog/post')->load(1); + var_dump($post); + } +} \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/etc/adminhtml.xml b/app/code/local/Triboo/Blog/etc/adminhtml.xml new file mode 100644 index 0000000..3260049 --- /dev/null +++ b/app/code/local/Triboo/Blog/etc/adminhtml.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + Triboo + + + + + + + + + + \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/etc/config.xml b/app/code/local/Triboo/Blog/etc/config.xml new file mode 100644 index 0000000..287990f --- /dev/null +++ b/app/code/local/Triboo/Blog/etc/config.xml @@ -0,0 +1,84 @@ + + + + + 0.1.1 + + + + + + Triboo_Blog_Block + + + + + Triboo_Blog_Helper + + + + + Triboo_Blog_Model + triboo_blog_resource + + + Triboo_Blog_Model_Resource + + + tbblog_post_entity
+
+ + tbblog_post_entity_datetime
+
+ + tbblog_post_entity_decimal
+
+ + tbblog_post_entity_int
+
+ + tbblog_post_entity_text
+
+ + tbblog_post_entity_varchar
+
+ + tbblog_post_entity_char
+
+
+
+
+ + + + Triboo_Blog + Triboo_Blog_Model_Resource_Setup + + + core_setup + + + + + core_write + + + + + core_read + + + +
+ + + + standard + + Triboo_Blog + blog + + + + +
\ No newline at end of file diff --git a/app/code/local/Triboo/Blog/etc/system.xml b/app/code/local/Triboo/Blog/etc/system.xml new file mode 100644 index 0000000..acd59ef --- /dev/null +++ b/app/code/local/Triboo/Blog/etc/system.xml @@ -0,0 +1,40 @@ + + + + + + 99999 + + + + + + tb_tab + 1000 + 1 + 1 + 1 + + + + text + 1 + 1 + 1 + 1 + + + + select + adminhtml/system_config_source_yesno + 1 + 1 + 1 + 1 + + + + + + + \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/sql/tbblog_setup/install-0.1.0.php b/app/code/local/Triboo/Blog/sql/tbblog_setup/install-0.1.0.php new file mode 100644 index 0000000..2443fa7 --- /dev/null +++ b/app/code/local/Triboo/Blog/sql/tbblog_setup/install-0.1.0.php @@ -0,0 +1,26 @@ +startSetup(); +/** + * Create all entity tables + */ +$installer->createEntityTables( + $this->getTable(Triboo_Blog_Helper_Config::ENTITY_TABLE_POST) +); +/** + * Add Entity type + */ +$installer->addEntityType(Triboo_Blog_Helper_Config::ENTITY_TYPE_CODE_POST, [ + 'entity_model' => Triboo_Blog_Helper_Config::ENTITY_MODEL_POST, + 'attribute_model' => '', + 'table' => Triboo_Blog_Helper_Config::ENTITY_TABLE_POST, + 'increment_model' => '', + 'increment_per_store' => '0' + ] +); +/** + * install Entities with method getDefaultEntities that is in Triboo_Blog_Model_Resource_Setup + */ +$installer->installEntities(); +$installer->endSetup(); \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/sql/tbblog_setup/upgrade-0.1.0-0.1.1.php b/app/code/local/Triboo/Blog/sql/tbblog_setup/upgrade-0.1.0-0.1.1.php new file mode 100644 index 0000000..c013b3c --- /dev/null +++ b/app/code/local/Triboo/Blog/sql/tbblog_setup/upgrade-0.1.0-0.1.1.php @@ -0,0 +1,130 @@ +startSetup(); +/** + * Adding new attribute "created_at" + */ +$installer->addAttribute(Triboo_Blog_Helper_Config::ENTITY_TYPE_CODE_POST , 'created_at', [ + 'type' => 'datetime', + 'label' => 'created_at', + 'input' => 'date', + 'class' => '', + 'source' => '', + 'global' => 0, + 'visible' => true, + 'required' => true, + 'user_defined' => true, + 'default' => '', + 'searchable' => false, + 'filterable' => false, + 'comparable' => false, + 'visible_on_front' => true, + 'unique' => false, + ] +); +/** + * Adding new attribute "updated_at" + */ +$installer->addAttribute(Triboo_Blog_Helper_Config::ENTITY_TYPE_CODE_POST , 'updated_at', [ + 'type' => 'datetime', + 'label' => 'updated_at', + 'input' => 'date', + 'class' => '', + 'source' => '', + 'global' => 0, + 'visible' => true, + 'required' => true, + 'user_defined' => true, + 'default' => '0', + 'searchable' => false, + 'filterable' => false, + 'comparable' => false, + 'visible_on_front' => true, + 'unique' => false, + ] +); +/** + * Adding new attribute "enable" + */ +$installer->addAttribute(Triboo_Blog_Helper_Config::ENTITY_TYPE_CODE_POST , 'enable', [ + 'type' => 'int', + 'label' => 'enable', + 'input' => 'boolean', + 'class' => '', + 'source' => '', + 'global' => 0, + 'visible' => true, + 'required' => true, + 'user_defined' => true, + 'default' => '0', + 'searchable' => false, + 'filterable' => false, + 'comparable' => false, + 'visible_on_front' => true, + 'unique' => false, + ] +); +/** + * Adding new attribute "post_image" + */ +$installer->addAttribute(Triboo_Blog_Helper_Config::ENTITY_TYPE_CODE_POST , 'post_image', [ + 'type' => 'varchar', + 'label' => 'post_image', + 'input' => 'media_image', + 'class' => '', + 'source' => '', + 'global' => 0, + 'visible' => true, + 'required' => true, + 'user_defined' => true, + 'default' => '', + 'searchable' => false, + 'filterable' => false, + 'comparable' => false, + 'visible_on_front' => true, + 'unique' => false, + ] +); +/** + * Adding new attribute "description" + */ +$installer->addAttribute(Triboo_Blog_Helper_Config::ENTITY_TYPE_CODE_POST , 'description', [ + 'type' => 'varchar', + 'label' => 'description', + 'input' => 'text', + 'class' => '', + 'source' => '', + 'global' => 0, + 'visible' => true, + 'required' => true, + 'user_defined' => true, + 'default' => '', + 'searchable' => false, + 'filterable' => false, + 'comparable' => false, + 'visible_on_front' => true, + 'unique' => false, + ] +); +/** + * Adding new attribute "short_description" + */ +$installer->addAttribute(Triboo_Blog_Helper_Config::ENTITY_TYPE_CODE_POST , 'short_description', [ + 'type' => 'varchar', + 'label' => 'description', + 'input' => 'text', + 'class' => '', + 'source' => '', + 'global' => 0, + 'visible' => true, + 'required' => true, + 'user_defined' => true, + 'default' => '', + 'searchable' => false, + 'filterable' => false, + 'comparable' => false, + 'visible_on_front' => true, + 'unique' => false, + ] +); +$installer -> endSetup(); \ No newline at end of file From 5cc8c77ee4d9ac13f0659d0d6937d688b96d0889 Mon Sep 17 00:00:00 2001 From: "Franco.vitelli" Date: Thu, 28 Mar 2019 10:28:20 +0100 Subject: [PATCH 05/19] fixed code style --- app/etc/modules/Triboo_Blog.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/etc/modules/Triboo_Blog.xml b/app/etc/modules/Triboo_Blog.xml index 10dd1f8..95f0210 100644 --- a/app/etc/modules/Triboo_Blog.xml +++ b/app/etc/modules/Triboo_Blog.xml @@ -1,9 +1,9 @@ - + true local - + From bdfeedf78553b9cf6cf1f55a3f17fa534cacd492 Mon Sep 17 00:00:00 2001 From: "Franco.vitelli" Date: Thu, 28 Mar 2019 10:29:04 +0100 Subject: [PATCH 06/19] removing .idea --- .idea/tribook.iml | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 .idea/tribook.iml diff --git a/.idea/tribook.iml b/.idea/tribook.iml deleted file mode 100644 index c956989..0000000 --- a/.idea/tribook.iml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file From 6c520c2d07cc0668a3dc261303e4c51d5e78a3ff Mon Sep 17 00:00:00 2001 From: "Franco.vitelli" Date: Thu, 28 Mar 2019 11:19:19 +0100 Subject: [PATCH 07/19] Make be post --- README.md | 4 +- app/code/local/Triboo/Blog/etc/adminhtml.xml | 5 ++- app/code/local/Triboo/Blog/etc/system.xml | 42 +++++++++++++++++--- modman | 4 +- 4 files changed, 45 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 220d24e..921e689 100755 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Blog Tribook +# Blog Triboo ## 0.1.1 - 27.03.2019 -- First release of the module tutorial \ No newline at end of file +- First release of the module tutorial diff --git a/app/code/local/Triboo/Blog/etc/adminhtml.xml b/app/code/local/Triboo/Blog/etc/adminhtml.xml index 3260049..40305d8 100644 --- a/app/code/local/Triboo/Blog/etc/adminhtml.xml +++ b/app/code/local/Triboo/Blog/etc/adminhtml.xml @@ -9,8 +9,11 @@ - Triboo + Triboo blog + + Triboo log + diff --git a/app/code/local/Triboo/Blog/etc/system.xml b/app/code/local/Triboo/Blog/etc/system.xml index acd59ef..2747fb5 100644 --- a/app/code/local/Triboo/Blog/etc/system.xml +++ b/app/code/local/Triboo/Blog/etc/system.xml @@ -2,15 +2,46 @@ - - 99999 + + 1 + - + tb_tab - 1000 + 1 + 1 + 1 + 1 + + + + text + 1 + 1 + 1 + 1 + + + + textarea + 1 + 1 + 1 + 1 + + + + + + + + + + tb_tab + 2 1 1 1 @@ -35,6 +66,7 @@ - + + \ No newline at end of file diff --git a/modman b/modman index 9f036a8..99379cd 100644 --- a/modman +++ b/modman @@ -1,2 +1,2 @@ -app/code/local/Tribook app/code/local/Tribook -app/etc/modules/Tribook_Blog.xml app/etc/modules/Tribook_Blog.xml \ No newline at end of file +app/code/local/Triboo app/code/local/Triboo +app/etc/modules/Triboo_Blog.xml app/etc/modules/Triboo_Blog.xml \ No newline at end of file From a798f16b4f56eecd42ecc87d3453e34c190b3e05 Mon Sep 17 00:00:00 2001 From: zameo94 <47932570+zameo94@users.noreply.github.com> Date: Thu, 28 Mar 2019 11:34:46 +0100 Subject: [PATCH 08/19] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 96364a4..0266e68 100755 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "luxifel/tribook", + "name": "zameo94/triboo", "type": "magento-module", "license": "public", "author": "Matteo Deliperi, Franco Vitelli", From c54c01dec5d5f5fb949a2f252b045fafb86c157d Mon Sep 17 00:00:00 2001 From: zameo94 <47932570+zameo94@users.noreply.github.com> Date: Thu, 28 Mar 2019 11:35:35 +0100 Subject: [PATCH 09/19] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0266e68..93f8e7d 100755 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "zameo94/triboo", + "name": "zameo94/tribook", "type": "magento-module", "license": "public", "author": "Matteo Deliperi, Franco Vitelli", From 13e88e2123cf48f84a2338904af93031de37460a Mon Sep 17 00:00:00 2001 From: zameo94 <47932570+zameo94@users.noreply.github.com> Date: Thu, 28 Mar 2019 12:29:53 +0100 Subject: [PATCH 10/19] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 93f8e7d..96364a4 100755 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "zameo94/tribook", + "name": "luxifel/tribook", "type": "magento-module", "license": "public", "author": "Matteo Deliperi, Franco Vitelli", From 0c0ea766da723a7bb8d2478fba7ca17b99d15ae4 Mon Sep 17 00:00:00 2001 From: "Matteo.deliperi" Date: Thu, 28 Mar 2019 14:18:40 +0100 Subject: [PATCH 11/19] Fix helper's layout --- app/code/local/Triboo/Blog/etc/system.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/code/local/Triboo/Blog/etc/system.xml b/app/code/local/Triboo/Blog/etc/system.xml index 2747fb5..2df1f10 100644 --- a/app/code/local/Triboo/Blog/etc/system.xml +++ b/app/code/local/Triboo/Blog/etc/system.xml @@ -1,14 +1,14 @@ - + 1 - + tb_tab 1 @@ -38,7 +38,7 @@ - + tb_tab 2 From f4fe2601bf3ff9b71c22a462fefa6b6e9e2cd319 Mon Sep 17 00:00:00 2001 From: "Matteo.deliperi" Date: Thu, 28 Mar 2019 15:03:13 +0100 Subject: [PATCH 12/19] Fix helper log --- app/code/local/Triboo/Blog/etc/adminhtml.xml | 5 +-- app/code/local/Triboo/Blog/etc/system.xml | 34 ++------------------ 2 files changed, 3 insertions(+), 36 deletions(-) diff --git a/app/code/local/Triboo/Blog/etc/adminhtml.xml b/app/code/local/Triboo/Blog/etc/adminhtml.xml index 40305d8..10719e5 100644 --- a/app/code/local/Triboo/Blog/etc/adminhtml.xml +++ b/app/code/local/Triboo/Blog/etc/adminhtml.xml @@ -9,11 +9,8 @@ - Triboo blog - - Triboo log - + diff --git a/app/code/local/Triboo/Blog/etc/system.xml b/app/code/local/Triboo/Blog/etc/system.xml index 2df1f10..322c63f 100644 --- a/app/code/local/Triboo/Blog/etc/system.xml +++ b/app/code/local/Triboo/Blog/etc/system.xml @@ -7,38 +7,8 @@ - - - - tb_tab - 1 - 1 - 1 - 1 - - - - text - 1 - 1 - 1 - 1 - - - - textarea - 1 - 1 - 1 - 1 - - - - - - - + tb_tab 2 @@ -66,7 +36,7 @@ - + \ No newline at end of file From 21dfb80e9b39785e15ac88e0f4f33c5800a84057 Mon Sep 17 00:00:00 2001 From: "Matteo.deliperi" Date: Thu, 28 Mar 2019 16:06:31 +0100 Subject: [PATCH 13/19] =?UTF-8?q?Add=20admin=20men=C3=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/code/local/Triboo/Blog/etc/adminhtml.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/code/local/Triboo/Blog/etc/adminhtml.xml b/app/code/local/Triboo/Blog/etc/adminhtml.xml index 10719e5..4e4dd56 100644 --- a/app/code/local/Triboo/Blog/etc/adminhtml.xml +++ b/app/code/local/Triboo/Blog/etc/adminhtml.xml @@ -15,6 +15,18 @@ + + + Blog + 250 + + + Manage Posts + 1 + + + + From cdef22a169426558720fddfabb8580b909216d1b Mon Sep 17 00:00:00 2001 From: "Matteo.deliperi" Date: Thu, 28 Mar 2019 16:58:26 +0100 Subject: [PATCH 14/19] =?UTF-8?q?Fix=20admin=20men=C3=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Triboo/Blog/controllers/IndexController.php | 16 ++++++++++++++++ app/code/local/Triboo/Blog/etc/adminhtml.xml | 15 ++++++++++++++- app/code/local/Triboo/Blog/etc/config.xml | 11 +++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/app/code/local/Triboo/Blog/controllers/IndexController.php b/app/code/local/Triboo/Blog/controllers/IndexController.php index b0215d6..39e4641 100644 --- a/app/code/local/Triboo/Blog/controllers/IndexController.php +++ b/app/code/local/Triboo/Blog/controllers/IndexController.php @@ -46,5 +46,21 @@ public function indexAction() */ $post = Mage::getModel('tribook_blog/post')->load(1); var_dump($post); + + /* + * For adminhtml menù + * load the layout + */ + $this->loadLayout(); + + /* + * add content + */ + $this->addContent($this->getLayout()->createBlock('core/template')); + + /* + * output display + */ + $this->renderLayout(); } } \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/etc/adminhtml.xml b/app/code/local/Triboo/Blog/etc/adminhtml.xml index 4e4dd56..5b08ac4 100644 --- a/app/code/local/Triboo/Blog/etc/adminhtml.xml +++ b/app/code/local/Triboo/Blog/etc/adminhtml.xml @@ -1,5 +1,19 @@ + + + + Blog + 1 + + + Manage Posts + + + + + + @@ -22,7 +36,6 @@ Manage Posts - 1 diff --git a/app/code/local/Triboo/Blog/etc/config.xml b/app/code/local/Triboo/Blog/etc/config.xml index 287990f..e558e8a 100644 --- a/app/code/local/Triboo/Blog/etc/config.xml +++ b/app/code/local/Triboo/Blog/etc/config.xml @@ -81,4 +81,15 @@ + + + + admin + + Triboo_Blog + blog + + + + \ No newline at end of file From 83eab30dcdc39eaabfb773074a62bb8855b1890b Mon Sep 17 00:00:00 2001 From: zameo94 <47932570+zameo94@users.noreply.github.com> Date: Thu, 28 Mar 2019 17:08:26 +0100 Subject: [PATCH 15/19] Update Data.php --- app/code/local/Triboo/Blog/Helper/Data.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/local/Triboo/Blog/Helper/Data.php b/app/code/local/Triboo/Blog/Helper/Data.php index d44bb2f..a4bdb9e 100644 --- a/app/code/local/Triboo/Blog/Helper/Data.php +++ b/app/code/local/Triboo/Blog/Helper/Data.php @@ -2,7 +2,7 @@ /** * Class Triboo_Blog_Helper_Data */ -class Tribook_Blog_Helper_Data extends Mage_Core_Helper_Abstract +class Triboo_Blog_Helper_Data extends Mage_Core_Helper_Abstract { /** * log file @@ -32,4 +32,4 @@ public function log($message) : string } return $message; } -} \ No newline at end of file +} From b8a5c491f4a609da9b6c837cad1b3cb3caf3f97f Mon Sep 17 00:00:00 2001 From: "Matteo.deliperi" Date: Thu, 28 Mar 2019 17:19:56 +0100 Subject: [PATCH 16/19] =?UTF-8?q?Fix=20admin=20men=C3=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/code/local/Triboo/Blog/Helper/Data.php | 2 +- app/code/local/Triboo/Blog/etc/adminhtml.xml | 4 ++-- app/code/local/Triboo/Blog/etc/system.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/code/local/Triboo/Blog/Helper/Data.php b/app/code/local/Triboo/Blog/Helper/Data.php index d44bb2f..00d68a2 100644 --- a/app/code/local/Triboo/Blog/Helper/Data.php +++ b/app/code/local/Triboo/Blog/Helper/Data.php @@ -2,7 +2,7 @@ /** * Class Triboo_Blog_Helper_Data */ -class Tribook_Blog_Helper_Data extends Mage_Core_Helper_Abstract +class Triboo_Blog_Helper_Data extends Mage_Core_Helper_Abstract { /** * log file diff --git a/app/code/local/Triboo/Blog/etc/adminhtml.xml b/app/code/local/Triboo/Blog/etc/adminhtml.xml index 5b08ac4..d4dc32f 100644 --- a/app/code/local/Triboo/Blog/etc/adminhtml.xml +++ b/app/code/local/Triboo/Blog/etc/adminhtml.xml @@ -4,7 +4,7 @@ Blog - 1 + 150 Manage Posts @@ -32,7 +32,7 @@ Blog - 250 + 150 Manage Posts diff --git a/app/code/local/Triboo/Blog/etc/system.xml b/app/code/local/Triboo/Blog/etc/system.xml index 322c63f..d03fc62 100644 --- a/app/code/local/Triboo/Blog/etc/system.xml +++ b/app/code/local/Triboo/Blog/etc/system.xml @@ -3,7 +3,7 @@ - 1 + 10 From 528db431b1035d49fc5769bc7aeb3fa312e8f635 Mon Sep 17 00:00:00 2001 From: "Matteo.deliperi" Date: Thu, 28 Mar 2019 18:04:30 +0100 Subject: [PATCH 17/19] Add Grid.php --- .../Triboo/Blog/Block/Adminhtml/Grid.php | 26 +++++++++++++++++++ app/code/local/Triboo/Blog/Helper/Data.php | 2 +- app/code/local/Triboo/Blog/etc/adminhtml.xml | 2 +- 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 app/code/local/Triboo/Blog/Block/Adminhtml/Grid.php diff --git a/app/code/local/Triboo/Blog/Block/Adminhtml/Grid.php b/app/code/local/Triboo/Blog/Block/Adminhtml/Grid.php new file mode 100644 index 0000000..586df6c --- /dev/null +++ b/app/code/local/Triboo/Blog/Block/Adminhtml/Grid.php @@ -0,0 +1,26 @@ +_controller = 'triboo_blog'; + $this->_blockGroup = 'blog'; + #header text label + $this->_headerText = 'Manage the posts'; + #button label + $this->_addButtonLabel = 'Add a post'; + parent::__construct(); + } +} \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/Helper/Data.php b/app/code/local/Triboo/Blog/Helper/Data.php index 00d68a2..a4bdb9e 100644 --- a/app/code/local/Triboo/Blog/Helper/Data.php +++ b/app/code/local/Triboo/Blog/Helper/Data.php @@ -32,4 +32,4 @@ public function log($message) : string } return $message; } -} \ No newline at end of file +} diff --git a/app/code/local/Triboo/Blog/etc/adminhtml.xml b/app/code/local/Triboo/Blog/etc/adminhtml.xml index d4dc32f..8910f1b 100644 --- a/app/code/local/Triboo/Blog/etc/adminhtml.xml +++ b/app/code/local/Triboo/Blog/etc/adminhtml.xml @@ -8,7 +8,7 @@ Manage Posts - + From 7fd05dbeae328a3cb6ec2200b809160928f20a32 Mon Sep 17 00:00:00 2001 From: "Matteo.deliperi" Date: Fri, 29 Mar 2019 10:19:54 +0100 Subject: [PATCH 18/19] Testing post controller --- .../Triboo/Blog/Block/Adminhtml/Grid.php | 4 +- .../controllers/Adminhtml/PostController.php | 31 +++++++++ .../Blog/controllers/IndexController.php | 66 ------------------- app/code/local/Triboo/Blog/etc/adminhtml.xml | 2 +- app/code/local/Triboo/Blog/etc/config.xml | 9 +-- 5 files changed, 39 insertions(+), 73 deletions(-) create mode 100644 app/code/local/Triboo/Blog/controllers/Adminhtml/PostController.php delete mode 100644 app/code/local/Triboo/Blog/controllers/IndexController.php diff --git a/app/code/local/Triboo/Blog/Block/Adminhtml/Grid.php b/app/code/local/Triboo/Blog/Block/Adminhtml/Grid.php index 586df6c..99c51d1 100644 --- a/app/code/local/Triboo/Blog/Block/Adminhtml/Grid.php +++ b/app/code/local/Triboo/Blog/Block/Adminhtml/Grid.php @@ -15,8 +15,8 @@ class Triboo_Blog_Block_Adminhtml_Grid extends Mage_Adminhtml_Block_Widget_Grid_ public function __construct() { #where you can find the controller - $this->_controller = 'triboo_blog'; - $this->_blockGroup = 'blog'; + $this->_controller = 'adminhtml_post'; + $this->_blockGroup = 'tbblog'; #header text label $this->_headerText = 'Manage the posts'; #button label diff --git a/app/code/local/Triboo/Blog/controllers/Adminhtml/PostController.php b/app/code/local/Triboo/Blog/controllers/Adminhtml/PostController.php new file mode 100644 index 0000000..8bd166c --- /dev/null +++ b/app/code/local/Triboo/Blog/controllers/Adminhtml/PostController.php @@ -0,0 +1,31 @@ +loadLayout(); + + /* + * add content + + $this->addContent($this->getLayout()->createBlock('core/template')); + + /* + * output display + * + $this->renderLayout(); + */ + } +} \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/controllers/IndexController.php b/app/code/local/Triboo/Blog/controllers/IndexController.php deleted file mode 100644 index 39e4641..0000000 --- a/app/code/local/Triboo/Blog/controllers/IndexController.php +++ /dev/null @@ -1,66 +0,0 @@ -setTitle('Test title'); - $post->setAuthor('Zoran Šalamun'); - $post->setDescription('This is a description'); - $post->setEnable(1); - $post->save(); - - - /* - * Getting posts collection - * -also load collection - * -this will load all post entries but without attributes - * -loaded data is only from tribook_blog_post_entity table - */ - $posts = Mage::getModel('tribook_blog/post')->getCollection(); - $posts->load(); - var_dump($posts); - - /* - * Getting post collection - * -load all posts - * -set attributes to be in collection data - */ - $posts = Mage::getModel('tribook_blog/post')->getCollection() - ->addAttributeToSelect('title') - ->addAttributeToSelect('author') - ->addAttributeToSelect('description') - ->addAttributeToSelect('enable'); - $posts->load(); - var_dump($posts); - - /* - * Load signle post - * -loading single post will get all attributes that we have set for post - */ - $post = Mage::getModel('tribook_blog/post')->load(1); - var_dump($post); - - /* - * For adminhtml menù - * load the layout - */ - $this->loadLayout(); - - /* - * add content - */ - $this->addContent($this->getLayout()->createBlock('core/template')); - - /* - * output display - */ - $this->renderLayout(); - } -} \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/etc/adminhtml.xml b/app/code/local/Triboo/Blog/etc/adminhtml.xml index 8910f1b..352eb65 100644 --- a/app/code/local/Triboo/Blog/etc/adminhtml.xml +++ b/app/code/local/Triboo/Blog/etc/adminhtml.xml @@ -8,7 +8,7 @@ Manage Posts - + adminhtml/post diff --git a/app/code/local/Triboo/Blog/etc/config.xml b/app/code/local/Triboo/Blog/etc/config.xml index e558e8a..fbfef71 100644 --- a/app/code/local/Triboo/Blog/etc/config.xml +++ b/app/code/local/Triboo/Blog/etc/config.xml @@ -83,13 +83,14 @@ - + admin - Triboo_Blog - blog + + Triboo_Blog_Adminhtml + - + \ No newline at end of file From 9aedcc774361ed8acb8ccfc75955d4d8b670fb29 Mon Sep 17 00:00:00 2001 From: "Matteo.deliperi" Date: Fri, 29 Mar 2019 12:45:10 +0100 Subject: [PATCH 19/19] Add grid --- .../Block/Adminhtml/{Grid.php => Post.php} | 6 +- .../Triboo/Blog/Block/Adminhtml/Post/Grid.php | 61 +++++++++++++++++++ app/code/local/Triboo/Blog/Helper/Data.php | 10 +-- .../controllers/Adminhtml/PostController.php | 26 +++++--- .../adminhtml/default/default/layout/blog.xml | 8 +++ 5 files changed, 93 insertions(+), 18 deletions(-) rename app/code/local/Triboo/Blog/Block/Adminhtml/{Grid.php => Post.php} (76%) create mode 100644 app/code/local/Triboo/Blog/Block/Adminhtml/Post/Grid.php create mode 100644 app/design/adminhtml/default/default/layout/blog.xml diff --git a/app/code/local/Triboo/Blog/Block/Adminhtml/Grid.php b/app/code/local/Triboo/Blog/Block/Adminhtml/Post.php similarity index 76% rename from app/code/local/Triboo/Blog/Block/Adminhtml/Grid.php rename to app/code/local/Triboo/Blog/Block/Adminhtml/Post.php index 99c51d1..3519aac 100644 --- a/app/code/local/Triboo/Blog/Block/Adminhtml/Grid.php +++ b/app/code/local/Triboo/Blog/Block/Adminhtml/Post.php @@ -1,12 +1,12 @@ setId('tbblog_post_grid'); + $this->setDefaultSort('entity_id'); + $this->setDefaultDir('DESC'); + $this->setSaveParametersInSession(true); + } + + /** + *@return array + */ + public function _prepareCollection(): array + { + $collection = Mage::getModel(Triboo_Blog_Helper_Config::ENTITY_TABLE_POST)->getCollection(); + $this->setCollection($collection); + return parent::_prepareCollection(); + } + + /** + * @return array + */ + public function _prepareColumns(): array + { + $this->addColumn( + 'entity_id', [ + 'header' => 'Entity ID', + 'index' => 'entity_id', + 'type' => 'number' + ]); + $this->addColumn( + 'is_active', [ + 'header' => 'Is Active', + 'index' => 'is_active', + 'type' => 'number' + ]); + $this->addColumn( + 'created_at', [ + 'header' => 'Created At', + 'index' => 'created_at', + 'type' => 'date' + ]); + $this->addColumn( + 'updated_at', [ + 'header' => 'Updated At', + 'index' => 'updated_at', + 'type' => 'date' + ]); + + return parent::_prepareColumns(); + } +} \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/Helper/Data.php b/app/code/local/Triboo/Blog/Helper/Data.php index a4bdb9e..01ce764 100644 --- a/app/code/local/Triboo/Blog/Helper/Data.php +++ b/app/code/local/Triboo/Blog/Helper/Data.php @@ -1,4 +1,7 @@ isLogEnable = Mage::getStoreConfig(Triboo_Blog_Helper_Config::LOG_ENABLE_CONFIG) ?: false; @@ -24,7 +24,7 @@ public function __construct() * @var $message * @return string */ - public function log($message) : string + public function log($message): string { if ($this->isLogEnable) { @@ -32,4 +32,4 @@ public function log($message) : string } return $message; } -} +} \ No newline at end of file diff --git a/app/code/local/Triboo/Blog/controllers/Adminhtml/PostController.php b/app/code/local/Triboo/Blog/controllers/Adminhtml/PostController.php index 8bd166c..86aa721 100644 --- a/app/code/local/Triboo/Blog/controllers/Adminhtml/PostController.php +++ b/app/code/local/Triboo/Blog/controllers/Adminhtml/PostController.php @@ -1,5 +1,7 @@ loadLayout(); - - /* - * add content - - $this->addContent($this->getLayout()->createBlock('core/template')); - /* - * output display - * + * output layout + */ $this->renderLayout(); - */ + } + + /** + * + */ + public function gridAction() + { + $this->loadLayout() + ->getresponse()->setBody( + $this->getLayout()->createBlock('blog/adminhtml_post_grid')->toHtml() + ); } } \ No newline at end of file diff --git a/app/design/adminhtml/default/default/layout/blog.xml b/app/design/adminhtml/default/default/layout/blog.xml new file mode 100644 index 0000000..580ab98 --- /dev/null +++ b/app/design/adminhtml/default/default/layout/blog.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file