RocketChat#755 [EDIT] Правки по мероприятиям

sibdigital · Nov 9, 2020 · 0919f43 · 0919f43
1 parent 8120473
commit 0919f43
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 12 deletions.
diff --git a/app/councils/client/views/AddCouncil.js b/app/councils/client/views/AddCouncil.js
@@ -274,7 +274,7 @@ function AddCouncilWithNewData({ council, onChange, context }) {
 				<Field mbe='x8'>
 					<Field.Label>{t('Description')} <span style={ { color: 'red' } }>{t('Editing')}</span></Field.Label>
 					<Field.Row>
-						<TextAreaInput border='1px solid #4fb0fc' value={description} onChange={(e) => setDescription(e.currentTarget.value)} placeholder={t('Description')} />
+						<TextAreaInput style={ { whiteSpace: 'normal' } } row='4' border='1px solid #4fb0fc' value={description} onChange={(e) => setDescription(e.currentTarget.value)} placeholder={t('Description')} />
 					</Field.Row>
 				</Field>
 				{ isEditUser && <EditInvitedUser invitedUser={currentInvitedUser} handleCancel={handleEditUser} handleInsertOrUpdateSubmit={handleInsertOrUpdatePerson}/>}

diff --git a/app/councils/client/views/Council.js b/app/councils/client/views/Council.js
@@ -158,8 +158,8 @@ export function CouncilPage() {
 		FlowRouter.go(`/council/edit/${ _id }/newParticipant`);
 	};
 
-	const onEmailSendClick = () => () => {
-		FlowRouter.go('manual-mail-sender');
+	const onEmailSendClick = (_id) => () => {
+		FlowRouter.go(`/manual-mail-sender/council/${ _id }`);
 	};
 
 	const onDeleteCouncilConfirm = useCallback(async () => {
@@ -203,7 +203,7 @@ export function CouncilPage() {
 				<Field mbe='x8'>
 					<Field.Label>{t('Description')}</Field.Label>
 					<Field.Row>
-						<TextAreaInput style={ { whiteSpace: 'normal' } } value={data.desc} row='3' readOnly fontScale='p1'/>
+						<TextAreaInput style={ { whiteSpace: 'normal' } } value={data.desc} row='4' readOnly fontScale='p1'/>
 					</Field.Row>
 				</Field>
 				<Field mbe='x8'>
@@ -217,7 +217,7 @@ export function CouncilPage() {
 						<Button marginInlineEnd='10px' small primary onClick={onNewParticipantClick(councilId)} aria-label={t('Add')}>
 							{t('Council_Add_Participant')}
 						</Button>
-						<Button marginInlineEnd='10px' small primary onClick={onEmailSendClick} aria-label={t('Send_email')}>
+						<Button marginInlineEnd='10px' small primary onClick={onEmailSendClick(councilId)} aria-label={t('Send_email')}>
 							{t('Send_email')}
 						</Button>
 						<Button small primary onClick={downloadCouncilParticipants(councilId)} aria-label={t('Download')}>

diff --git a/app/councils/client/views/Councils.js b/app/councils/client/views/Councils.js
@@ -7,8 +7,8 @@ import { GenericTable, Th } from '../../../../client/components/GenericTable';
 import { useFormatDateAndTime } from '../../../../client/hooks/useFormatDateAndTime';
 import { useMethod } from '../../../../client/contexts/ServerContext';
 import moment from 'moment';
-import { useSetModal } from '/client/contexts/ModalContext';
-import { useToastMessageDispatch } from '/client/contexts/ToastMessagesContext';
+import { useSetModal } from '../../../../client/contexts/ModalContext';
+import { useToastMessageDispatch } from '../../../../client/contexts/ToastMessagesContext';
 
 const DeleteWarningModal = ({ title, onDelete, onCancel, ...props }) => {
 	const t = useTranslation();

diff --git a/app/councils/client/views/EditCouncil.js b/app/councils/client/views/EditCouncil.js
@@ -316,7 +316,7 @@ function EditCouncilWithNewData({ council, onChange, context }) {
 				<Field mbe='x8'>
 					<Field.Label>{t('Description')} <span style={ { color: 'red' } }>{t('Editing')}</span></Field.Label>
 					<Field.Row>
-						<TextAreaInput style={ { whiteSpace: 'normal' } } row='3' border='1px solid #4fb0fc' value={description} onChange={(e) => setDescription(e.currentTarget.value)} placeholder={t('Description')} />
+						<TextAreaInput style={ { whiteSpace: 'normal' } } row='4' border='1px solid #4fb0fc' value={description} onChange={(e) => setDescription(e.currentTarget.value)} placeholder={t('Description')} />
 					</Field.Row>
 				</Field>
 				<Field mbe='x8'>

diff --git a/client/routes.js b/client/routes.js
@@ -190,7 +190,7 @@ FlowRouter.route('/working-group-meetings/:context?/:id?', {
 	}],
 });
 
-FlowRouter.route('/manual-mail-sender', {
+FlowRouter.route('/manual-mail-sender/:context?/:id?', {
 	name: 'manual-mail-sender',
 	action: () => {
 		renderRouteComponent(() => import('../app/manual-mail-sender/client/views/index'), { template: 'main', region: 'center' });