From 56c3fa3c9fd303495f79588a4260398b15bb3087 Mon Sep 17 00:00:00 2001 From: Walter Lim Date: Thu, 20 Aug 2020 12:33:08 +1200 Subject: [PATCH] restore description to activitiy template forms --- components/Op/OpAboutPanel.js | 12 ++++++------ components/Op/OpShortForm.js | 8 +++++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/components/Op/OpAboutPanel.js b/components/Op/OpAboutPanel.js index 234bc4948..fd38d011e 100644 --- a/components/Op/OpAboutPanel.js +++ b/components/Op/OpAboutPanel.js @@ -21,12 +21,6 @@ export function OpAboutPanel ({ op }) {

- {subtitle} - {description && - <> - {description} - - } {op.fromActivity && <> @@ -34,7 +28,13 @@ export function OpAboutPanel ({ op }) { } + {description && + <> + {description} + + } + {subtitle}
diff --git a/components/Op/OpShortForm.js b/components/Op/OpShortForm.js index 66eefb678..1b5a099fd 100644 --- 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 {
+ + @@ -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() }),