Fix notes not being visible on drafts / revisions

Fixes #4

Author: Tam

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.5 - 2021-06-14
+### Fixed
+- Fix notes not being visible on drafts / revisions (Fixes #4)
+
 ## 1.0.4 - 2020-12-01
 ### Fixed
 - Fix `a ? b : c ? d : e` deprecation warning (Fixes #3)

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "ether/notes",
   "description": "A note taking field type for Craft CMS 3",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "type": "craft-plugin",
   "license": "proprietary",
   "minimum-stability": "dev",

src/Service.php

@@ -15,6 +15,7 @@
 use craft\elements\User;
 use craft\helpers\ArrayHelper;
 use craft\helpers\DateTimeHelper;
+use craft\helpers\ElementHelper;
 use DateTime;
 use yii\db\Expression;
 
@@ -56,6 +57,9 @@ public function delete ($id)
 
 	public function getNotesByElement (ElementInterface $element, $translatable = false)
 	{
+		if ($element->getIsDraft() || $element->getIsRevision())
+			$element = ElementHelper::sourceElement($element);
+
 		$where = [
 			'elementId' => $element->id,
 		];

src/templates/field.twig

@@ -2,6 +2,10 @@
 	{% if allowAdding %}
 		{% import "_includes/forms" as forms %}
 
+		{% if element.isDraft or element.isRevision %}
+			<small class="notes-small">It looks like you're editing a {{ element.isDraft ? 'draft' : 'revision' }}. Be aware that notes are shared across all versions of an {{ element.className|split('\\')|last }}.</small>
+		{% endif %}
+
 		{{ forms.textarea({
 			placeholder: 'Add a note'|t('notes'),
 			class: 'notes-input',

src/web/notes.css

@@ -28,7 +28,8 @@
 .notes p {
 	margin-bottom: 0;
 }
-.notes small {
+.notes small,
+.notes-small {
 	color: #9aa5b1;
 	font-size: 11px;
 }