Merge pull request #95 from luyadev/1.1

fix bug with not wirteable attributes
luyadev · Apr 12, 2018 · 1856e9a · 1856e9a
2 parents 902943b + 8a1944f
commit 1856e9a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. This projec
 
 ## 1.1.2 (in progress)
 
+## 1.1.1.1 (12. April 2018)
+
++ [#23](https://github.com/luyadev/luya-kickstarter/issues/23) Fix issue with not writeable attributes on assign.
+
 ## 1.1.1 (11. April 2018)
 
 ### Added

diff --git a/src/ngrest/plugins/Text.php b/src/ngrest/plugins/Text.php
@@ -67,7 +67,7 @@ public function onAfterFind($event)
  */
  public function onAssign($event)
  {
- if (!$this->i18n && $this->encoding) {
+ if (!$this->i18n && $this->encoding && $this->isAttributeWriteable($event)) {
  $event->sender->setAttribute($this->name, Html::encode($event->sender->getAttribute($this->name)));
  }
  }

diff --git a/src/ngrest/plugins/Textarea.php b/src/ngrest/plugins/Textarea.php
@@ -96,7 +96,7 @@ public function onAfterFind($event)
  */
  public function onAssign($event)
  {
- if (!$this->i18n && $this->encoding) {
+ if (!$this->i18n && $this->encoding && $this->isAttributeWriteable($event)) {
  $event->sender->setAttribute($this->name, Html::encode($event->sender->getAttribute($this->name)));
  }
  }