Merge pull request #1033 from voluntarily/Adam-Emergency-fix

VP1871 - Adam Emergency Fix for demo
voluntarily · Aug 20, 2020 · 41c2b8c · 41c2b8c
2 parents b6379f1 + 56c3fa3
commit 41c2b8c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/components/Op/OpAboutPanel.js b/components/Op/OpAboutPanel.js
@@ -21,20 +21,20 @@ export function OpAboutPanel ({ op }) {
       <OpSectionGrid>
         <H3><FormattedMessage id='OpAboutPanel.section.title.about' defaultMessage='About' /></H3>
         <div>
-          {subtitle}
-          {description &&
-            <>
-              <Html>{description}</Html>
-              <Divider />
-            </>}
           {op.fromActivity &&
             <>
               <Html>
                 {op.fromActivity.description}
               </Html>
               <Divider />
             </>}
+          {description &&
+            <>
+              <Html>{description}</Html>
+              <Divider />
+            </>}
 
+          {subtitle}
           <TagContainer>
             <h5><FormattedMessage id='OpAboutPanel.categories' defaultMessage='Categories' /></h5>
             <TagDisplay tags={op.tags} />

diff --git a/components/Op/OpShortForm.js b/components/Op/OpShortForm.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types'
 import React, { Component } from 'react'
 import { OpportunityStatus } from '../../server/api/opportunity/opportunity.constants'
 import OpFormDate from './OpFormDate'
-// import OpFormDescription from './OpFormDescription'
+import OpFormDescription from './OpFormDescription'
 import OpFormPublishBtns from './OpFormDoneBtns'
 import OpFormLocation from './OpFormLocation'
 import OpFormTitle from './OpFormTitle'
@@ -40,7 +40,7 @@ class OpShortForm extends Component {
           op.date = [] // Dirty work around to not change schema
           op.date.push(startDateValue, endDateValue)
           // op.name = values.name
-          // op.subtitle = values.subtitle
+          op.subtitle = values.subtitle
           // op.tags = values.tags
 
           const duration = moment.duration()
@@ -102,6 +102,8 @@ class OpShortForm extends Component {
         <OpFormTitle type={op.type} title={op.name} onBack={this.props.onCancel} />
         <Divider />
         <Form colon={false}>
+          <OpFormDescription getFieldDecorator={getFieldDecorator} type={op.type} />
+          <Divider />
           <OpFormLocation getFieldDecorator={getFieldDecorator} setFieldsValue={setFieldsValue} type={op.type} orgMembership={orgMembership} addressFinderKey={this.props.locations.addressFinderKey} />
           <Divider />
           <OpFormDate getFieldDecorator={getFieldDecorator} type={op.type} onChange={this.handleStartDateChange} />
@@ -176,7 +178,7 @@ export default Form.create({
 
     return {
       // name: Form.createFormField({ ...op.name, value: op.name }),
-      // subtitle: Form.createFormField({ value: op.subtitle }),
+      subtitle: Form.createFormField({ value: op.subtitle }),
       description: Form.createFormField({ value: op.description }),
       durationHours: Form.createFormField({ value: totalHours }),
       durationMinutes: Form.createFormField({ value: isoDuration.minutes() }),