Merge pull request #637 from rmdstudio/master

hashtags
anahitasocial · Dec 7, 2022 · f4d75a2 · f4d75a2
2 parents 3282f4c + 620e28a
commit f4d75a2
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 20 deletions.
diff --git a/packages/Articles/src/components/com_articles/templates/stories/article_add.php b/packages/Articles/src/components/com_articles/templates/stories/article_add.php
@@ -4,13 +4,7 @@
 	<?= sprintf(@text('COM-ARTICLES-STORY-ARTICLE-ADD'), @name($subject), @route($object->getURL())) ?>
 </data>
 
-<data name="body">
-	<? if ($object->hasCover()): ?>
-	<div class="entity-portrait-medium">
-		<?= @cover($object, 'medium') ?>
-	</div>
-	<? endif ?>
-
+<data name="body">	
     <h4 class="entity-title">
     	<?= @link($object)?>
     </h4>

diff --git a/packages/Articles/src/components/com_articles/templates/stories/article_comment.php b/packages/Articles/src/components/com_articles/templates/stories/article_comment.php
@@ -5,12 +5,6 @@
 </data>
 
 <data name="body">
-	<? if ($object->hasCover()): ?>
-	<div class="entity-portrait-medium">
-		<?= @cover($object, 'medium') ?>
-	</div>
-	<? endif ?>
-
     <h4 class="entity-title">
     	<?= @link($object) ?>
     </h4>

diff --git a/src/components/com_hashtags/controllers/behaviors/hashtaggable.php b/src/components/com_hashtags/controllers/behaviors/hashtaggable.php
@@ -53,7 +53,7 @@ public function updateHashtagsFromBody(AnCommandContext $context)
 
         if (is_array($terms)) {
             foreach ($entity->hashtags as $hashtag) {
-                if (!in_array($hashtag->name, array_map('strtolower', $terms))) {
+                if (!in_array(strtolower($hashtag->name), array_map('strtolower', $terms))) {
                     $entity->removeHashtag($hashtag->name);
                 }
             }

diff --git a/src/components/com_hashtags/domains/behaviors/hashtaggable.php b/src/components/com_hashtags/domains/behaviors/hashtaggable.php
@@ -27,7 +27,7 @@ protected function _initialize(AnConfig $config)
             'relationships' => array(
                 'hashtags' => array(
                     'through' => 'com:hashtags.domain.entity.tag',
-                    'target' => str_replace('repository', 'entity', $identifier),
+                    'target' => $config->target ? $config->target : 'com:base.domain.entity.node',
                     'child_key' => 'taggable',
                     'target_child_key' => 'hashtag',
                     'inverse' => true,

diff --git a/src/components/com_hashtags/domains/entities/tag.php b/src/components/com_hashtags/domains/entities/tag.php
@@ -27,7 +27,8 @@ protected function _initialize(AnConfig $config)
                 'hashtag' => 'nodeA',
             ),
             'relationships' => array(
-                'hashtag' => array('parent' => 'com:hashtags.domain.entity.hashtag'),
+                'hashtag' => array(
+                    'parent' => 'com:hashtags.domain.entity.hashtag'),
             ),
         ));
 
@@ -52,6 +53,10 @@ protected function _afterEntityInsert(AnCommandContext $context)
     protected function _afterEntityDelete(AnCommandContext $context)
     {
         $this->resetStats();
+
+        if (count($this->hashtag->taggables) === 0) {
+            $this->hashtag->delete();
+        }
     }
 
     /**
@@ -62,9 +67,5 @@ protected function _afterEntityDelete(AnCommandContext $context)
     private function resetStats()
     {
         $this->hashtag->resetStats(array($this->hashtag));
-
-        if (count($this->hashtag->taggables) === 0) {
-            $this->hashtag->delete();
-        }
     }
 }