fixed manager and removed quip dependency

modxcms · Jun 30, 2022 · 4813d5b · 4813d5b
1 parent 83ecf47
commit 4813d5b
Show file tree

Hide file tree

Showing 15 changed files with 76 additions and 59 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@ _build/build.config.php
 config.core.php
 .idea
 nbproject
-.DS_Store
+.DS_Store
+_packages
diff --git a/_build/build.transport.php b/_build/build.transport.php
@@ -35,7 +35,7 @@
 define('PKG_NAME','Articles');
 define('PKG_NAME_LOWER',strtolower(PKG_NAME));
 define('PKG_VERSION','2.0.0');
-define('PKG_RELEASE','alpha1');
+define('PKG_RELEASE','beta');
 
 /* define sources */
 $root = dirname(dirname(__FILE__)).'/';

diff --git a/_build/resolvers/dependencies.resolver.php b/_build/resolvers/dependencies.resolver.php
@@ -24,7 +24,6 @@
             'archivist' => '1.2.4',
             'getpage' => '1.2.4',
             'getresources' => '1.7.0',
-            'quip' => '2.3.3',
             'taglister' => '1.1.7',
         ];
 

diff --git a/_packages/articles-2.0.0-alpha1.transport.zip b/_packages/articles-2.0.0-alpha1.transport.zip
diff --git a/assets/components/articles/js/article/create.js b/assets/components/articles/js/article/create.js
@@ -35,7 +35,6 @@ Ext.extend(Articles.panel.Article,MODx.panel.Resource,{
             ,defaults: {
                 border: false
                 ,msgTarget: 'under'
-                ,width: 400
             }
             ,items: this.getMainFields(config)
         });
@@ -311,7 +310,7 @@ Ext.extend(Articles.panel.Article,MODx.panel.Resource,{
             tagField.setValue(this.config.record.tags);
 
             MODx.Ajax.request({
-                url: Articles.connector_url
+                url: MODx.config.connector_url
                 ,params: {
                     action: 'Articles\\Processors\\Extras\\GetTags'
                     ,container: this.config.record['parent']

diff --git a/assets/components/articles/js/article/update.js b/assets/components/articles/js/article/update.js
@@ -217,7 +217,6 @@ Ext.extend(Articles.panel.Article,MODx.panel.Resource,{
             ,defaults: {
                 border: false
                 ,msgTarget: 'under'
-                ,width: 400
             }
             ,items: this.getMainFields(config)
         });
@@ -552,7 +551,7 @@ Ext.extend(Articles.panel.Article,MODx.panel.Resource,{
             }
 
             MODx.Ajax.request({
-                url: Articles.connector_url
+                url: MODx.config.connector_url
                 ,params: {
                     action: 'Articles\\Processors\\Extras\\GetTags'
                     ,container: this.config.record['parent']

diff --git a/assets/components/articles/js/container/articles.import.window.js b/assets/components/articles/js/container/articles.import.window.js
@@ -8,7 +8,7 @@ Articles.window.ArticlesImport = function(config) {
         // ,height: 150
         // ,width: '75%'
         ,width: 600
-        ,url: Articles.connector_url
+        ,url: MODx.config.connector_url
         ,action: 'Articles\\Processors\\Container\\Import'
         ,fileUpload: true
         ,fields: [{

diff --git a/assets/components/articles/js/container/container.articles.grid.js b/assets/components/articles/js/container/container.articles.grid.js
@@ -9,7 +9,7 @@ Articles.grid.ContainerArticles = function(config) {
     Ext.applyIf(config,{
         id: 'articles-grid-container-articles'
         ,title: _('articles.articles')
-        ,url: Articles.connector_url
+        ,url: MODx.config.connector_url
         ,baseParams: {
             action: 'Articles\\Processors\\Article\\GetList'
             ,'parent': config.resource

diff --git a/assets/components/articles/js/container/container.common.js b/assets/components/articles/js/container/container.common.js
@@ -859,7 +859,7 @@ Articles.panel.ContainerAdvancedSettings = function(config) {
                 ,fieldLabel: _('articles.setting.commentsEnabled')
                 ,description: MODx.expandHelp ? '' : _('articles.setting.commentsEnabled_desc')
                 ,anchor: '30%'
-                ,value: 1
+                ,value: 0
                 ,listeners: oc
             },{
                 xtype: MODx.expandHelp ? 'label' : 'hidden'

diff --git a/assets/components/articles/js/container/create.js b/assets/components/articles/js/container/create.js
@@ -35,7 +35,6 @@ Ext.extend(Articles.panel.Container,MODx.panel.Resource,{
             ,defaults: {
                 border: false
                 ,msgTarget: 'side'
-                ,width: 400
             }
             ,items: this.getMainFields(config)
         });

diff --git a/assets/components/articles/js/container/update.js b/assets/components/articles/js/container/update.js
@@ -55,7 +55,6 @@ Ext.extend(Articles.panel.Container,MODx.panel.Resource,{
             ,defaults: {
                 border: false
                 ,msgTarget: 'side'
-                ,width: 400
             }
             ,items: this.getMainFields(config)
         });
@@ -85,29 +84,32 @@ Ext.extend(Articles.panel.Container,MODx.panel.Resource,{
             ,autoHeight: true
             ,items: this.getBlogSettings(config)
         });
-        it.push({
-            title: _('articles.comments')
-            ,id: 'articles-tab-comments'
-            ,autoHeight: true
-            ,items: [{
-                html: _('articles.comments.intro_msg')
-                ,border: false
-                ,bodyCssClass: 'panel-desc'
-            },{
-                xtype: 'panel'
-                ,bodyCssClass: 'main-wrapper'
+
+        if(config.commentsEnabled) { 
+            it.push({
+                title: _('articles.comments')
+                ,id: 'articles-tab-comments'
                 ,autoHeight: true
-                ,border: false
                 ,items: [{
-                    xtype: 'quip-grid-comments'
-                    ,cls: 'quip-thread-grid'
-                    ,family: 'b'+config.record.id
-                    ,preventRender: true
-                    ,width: '98%'
-                    ,bodyStyle: 'padding: 0'
+                    html: _('articles.comments.intro_msg')
+                    ,border: false
+                    ,bodyCssClass: 'panel-desc'
+                },{
+                    xtype: 'panel'
+                    ,bodyCssClass: 'main-wrapper'
+                    ,autoHeight: true
+                    ,border: false
+                    ,items: [{
+                        xtype: 'quip-grid-comments'
+                        ,cls: 'quip-thread-grid'
+                        ,family: 'b'+config.record.id
+                        ,preventRender: true
+                        ,width: '98%'
+                        ,bodyStyle: 'padding: 0'
+                    }]
                 }]
-            }]
-        });
+            });
+        }
         if (config.show_tvs && MODx.config.tvs_below_content != 1) {
             it.push(this.getTemplateVariablesPanel(config));
         }

diff --git a/assets/components/articles/js/extras/combo.js b/assets/components/articles/js/extras/combo.js
@@ -17,7 +17,7 @@ Articles.combo.Tag = function(config, getStore) {
         ,editable: true
         ,forceSelection: false
         ,pageSize: 20
-        ,url: Articles.connector_url
+        ,url: MODx.config.connector_url
         ,baseParams: {action: 'Articles\\Processors\\Extras\\GetTags'}
     });
     Ext.applyIf(config,{

diff --git a/core/components/articles/controllers/article/update.class.php b/core/components/articles/controllers/article/update.class.php
@@ -29,8 +29,15 @@
 class ArticleUpdateManagerController extends ResourceUpdateManagerController {
     /** @var Article $resource */
     public $resource;
-
+    /** @var boolean $commentsEnabled */
+    public $commentsEnabled = false;
     public function loadCustomCssJs() {
+        if ($this->modx->getOption('commentsEnabled',$settings,false)) {
+            $quipCorePath = $this->modx->getOption('quip.core_path',null,$this->modx->getOption('core_path',null,MODX_CORE_PATH).'components/quip/');
+            if ($this->modx->addPackage('quip',$quipCorePath.'model/')) {
+                $this->commentsEnabled = true;
+            }
+        }
         $managerUrl = $this->context->getOption('manager_url', MODX_MANAGER_URL, $this->modx->_userConfig);
         $articlesAssetsUrl = $this->modx->getOption('articles.assets_url',null,$this->modx->getOption('assets_url',null,MODX_ASSETS_URL).'components/articles/');
         $quipAssetsUrl = $this->modx->getOption('quip.assets_url',null,$this->modx->getOption('assets_url',null,MODX_ASSETS_URL).'components/quip/');
@@ -46,16 +53,18 @@ public function loadCustomCssJs() {
         $this->addJavascript($articlesJsUrl.'extras/combo.js');
         $this->addJavascript($articlesJsUrl.'extras/tagfield.js');
 
-        $this->addCss($quipAssetsUrl.'css/mgr.css');
-        $this->addJavascript($quipAssetsUrl.'js/quip.js');
-        $this->addJavascript($quipAssetsUrl.'js/widgets/comments.grid.js');
-        $this->addHtml('<script type="text/javascript">
-        Ext.onReady(function() {
-            Quip.config = '.$this->modx->toJSON([]).';
-            Quip.config.connector_url = "'.$quipAssetsUrl.'connector.php";
-            Quip.request = '.$this->modx->toJSON($_GET).';
-        });
-        </script>');
+        if($this->commentsEnabled) {
+            $this->addCss($quipAssetsUrl.'css/mgr.css');
+            $this->addJavascript($quipAssetsUrl.'js/quip.js');
+            $this->addJavascript($quipAssetsUrl.'js/widgets/comments.grid.js');
+            $this->addHtml('<script type="text/javascript">
+            Ext.onReady(function() {
+                Quip.config = '.$this->modx->toJSON([]).';
+                Quip.config.connector_url = "'.$quipAssetsUrl.'connector.php";
+                Quip.request = '.$this->modx->toJSON($_GET).';
+            });
+            </script>');
+        }
         $this->addLastJavascript($articlesJsUrl.'article/update.js');
         $this->addHtml('
         <script type="text/javascript">
@@ -98,7 +107,7 @@ public function process(array $scriptProperties = []) {
         $this->getTagsTV();
 
         $settings = $this->resource->getContainerSettings();
-        $this->resourceArray['commentsEnabled'] = $this->modx->getOption('commentsEnabled',$settings,true);
+        $this->resourceArray['commentsEnabled'] = $this->commentsEnabled;
         //$this->resourceArray['richtext'] = $this->modx->getOption('articlesRichtext',$settings,1);
 
         return $placeholders;

diff --git a/core/components/articles/controllers/container/update.class.php b/core/components/articles/controllers/container/update.class.php
@@ -29,7 +29,15 @@
 class ArticlesContainerUpdateManagerController extends ResourceUpdateManagerController {
     /** @var ArticlesContainer $resource */
     public $resource;
+    /** @var boolean $commentsEnabled */
+    public $commentsEnabled = false;
     public function loadCustomCssJs() {
+        if ($this->modx->getOption('commentsEnabled',$settings,false)) {
+            $quipCorePath = $this->modx->getOption('quip.core_path',null,$this->modx->getOption('core_path',null,MODX_CORE_PATH).'components/quip/');
+            if ($this->modx->addPackage('quip',$quipCorePath.'model/')) {
+                $this->commentsEnabled = true;
+            }
+        }
         $managerUrl = $this->context->getOption('manager_url', MODX_MANAGER_URL, $this->modx->_userConfig);
         $articlesAssetsUrl = $this->modx->getOption('articles.assets_url',null,$this->modx->getOption('assets_url',null,MODX_ASSETS_URL).'components/articles/');
         $quipAssetsUrl = $this->modx->getOption('quip.assets_url',null,$this->modx->getOption('assets_url',null,MODX_ASSETS_URL).'components/quip/');
@@ -47,17 +55,18 @@ public function loadCustomCssJs() {
         $this->addJavascript($articlesJsUrl.'container/articles.import.window.js');
         $this->addLastJavascript($articlesJsUrl.'container/update.js');
 
-
-        $this->addCss($quipAssetsUrl.'css/mgr.css');
-        $this->addJavascript($quipAssetsUrl.'js/quip.js');
-        $this->addJavascript($quipAssetsUrl.'js/widgets/comments.grid.js');
-        $this->addHtml('<script type="text/javascript">
-        Ext.onReady(function() {
-            Quip.config = '.$this->modx->toJSON([]).';
-            Quip.config.connector_url = "'.$quipAssetsUrl.'connector.php";
-            Quip.request = '.$this->modx->toJSON($_GET).';
-        });
-        </script>');
+        if($this->commentsEnabled) {
+            $this->addCss($quipAssetsUrl.'css/mgr.css');
+            $this->addJavascript($quipAssetsUrl.'js/quip.js');
+            $this->addJavascript($quipAssetsUrl.'js/widgets/comments.grid.js');
+            $this->addHtml('<script type="text/javascript">
+            Ext.onReady(function() {
+                Quip.config = '.$this->modx->toJSON([]).';
+                Quip.config.connector_url = "'.$quipAssetsUrl.'connector.php";
+                Quip.request = '.$this->modx->toJSON($_GET).';
+            });
+            </script>');
+        }
         $settings = $this->resource->getContainerSettings();
         $this->resourceArray['articles_container_settings'] = $settings;
 
@@ -66,7 +75,7 @@ public function loadCustomCssJs() {
         // <![CDATA[
         Articles.assets_url = "'.$articlesAssetsUrl.'";
         Articles.connector_url = "'.$connectorUrl.'";
-        Articles.commentsEnabled = '.($this->modx->getOption('commentsEnabled',$settings,true) ? 1 : 0).';
+        Articles.commentsEnabled = '.($this->commentsEnabled ? 1 : 0).';
         MODx.config.publish_document = "'.$this->canPublish.'";
         MODx.onDocFormRender = "'.$this->onDocFormRender.'";
         MODx.ctx = "'.$this->resource->get('context_key').'";

diff --git a/core/components/articles/src/Processors/Article/GetList.php b/core/components/articles/src/Processors/Article/GetList.php
@@ -30,7 +30,7 @@ class GetList extends GetListProcessor {
     /** @var ArticlesContainer $container */
     public $container;
     /** @var boolean $commentsEnabled */
-    public $commentsEnabled = true;
+    public $commentsEnabled = false;
 
     public function initialize() {
 
@@ -50,7 +50,7 @@ public function initialize() {
 
         if ($this->getParentContainer()) {
             $settings = $this->container->getContainerSettings();
-            if ($this->modx->getOption('commentsEnabled',$settings,true)) {
+            if ($this->modx->getOption('commentsEnabled',$settings,false)) {
                 $quipCorePath = $this->modx->getOption('quip.core_path',null,$this->modx->getOption('core_path',null,MODX_CORE_PATH).'components/quip/');
                 if ($this->modx->addPackage('quip',$quipCorePath.'model/')) {
                     $this->commentsEnabled = true;