Merge pull request #1999 from jrjohnson/1986-cidescription

Fix multiple issues with CI overview description field
ilios · Aug 18, 2016 · cf832d5 · cf832d5
2 parents e36fefb + 6f65d3f
commit cf832d5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/app/components/curriculum-inventory-report-overview.js b/app/components/curriculum-inventory-report-overview.js
@@ -78,8 +78,8 @@ export default Component.extend(Validations, ValidationErrorDisplay, {
       });
     },
     revertDescriptionChanges(){
-      const program = this.get('report');
-      this.set('report', program.get('description'));
+      const report = this.get('report');
+      this.set('description', report.get('description'));
     },
   }
 });
diff --git a/app/templates/components/curriculum-inventory-report-overview.hbs b/app/templates/components/curriculum-inventory-report-overview.hbs
@@ -29,7 +29,7 @@
         {{inplace-select value=report.year displayValueOverride=report.yearLabel options=yearOptions save="changeYear"}}
       {{/if}}
     </div>
-    
+
     <div class="block">
       <label>{{t "general.program"}}:</label>
       <span>{{report.program.title}} ({{report.program.shortTitle}})</span>
@@ -41,21 +41,18 @@
           {{report.description}}
         {{else}}
           {{#editable-field
-          value=shortTitle
+          value=description
           save=(action 'changeDescription')
           close=(action 'revertDescriptionChanges')
           clickPrompt=(if report.description report.description (t 'general.clickToEdit'))
           as |isSaving save close|
           }}
-            {{one-way-textarea
-              value=description
-              update=(action (mut description))
-              onenter=save
-              onescape=close
-              disabled=isSaving
-              focusOut=(action 'addErrorDisplayFor' 'description')
-              keyPress=(action 'addErrorDisplayFor' 'description')
-            }}
+            <textarea
+              onchange={{action (mut description) value="target.value"}}
+              value={{description}}
+              disabled={{isSaving}}
+              onkeypress={{action 'addErrorDisplayFor' 'description'}}
+            >{{description}}</textarea>
             {{#if (and (v-get this 'description' 'isInvalid') (is-in showErrorsFor 'description'))}}
               <span class="validation-error-message">{{v-get this 'description' 'message'}}</span>
             {{/if}}