Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into SDBELGA-239
Browse files Browse the repository at this point in the history
* upstream/master:
  enable datetime field
  • Loading branch information
ride90 committed Dec 6, 2019
2 parents 1bede90 + a8c7407 commit 1ddf863
Show file tree
Hide file tree
Showing 3 changed files with 154 additions and 118 deletions.
2 changes: 2 additions & 0 deletions client/belga/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import belgaImage from './image';
import belga360Archive from './360archive';
import planningExtension from 'superdesk-planning-extension';
import markForUserExtension from 'superdesk-core/scripts/extensions/markForUser/dist/src/extension';
import datetimeFieldExtension from 'superdesk-core/scripts/extensions/datetimeField/dist/src/extension';
import belgaCoverageExtension from '../extensions/belgaCoverage/dist/index';

class UserAvatar extends React.Component<{user: IUser}> {
Expand All @@ -24,6 +25,7 @@ setTimeout(() => {
startApp([
planningExtension,
markForUserExtension,
datetimeFieldExtension,
belgaCoverageExtension,
],{UserAvatar});
});
Expand Down
4 changes: 2 additions & 2 deletions client/extensions/belgaCoverage/src/belga-coverage-editor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ function getData(event: DragEvent) {
return event.dataTransfer ? event.dataTransfer.getData(ALLOWED) : '';
}

export function getBelgaCoverageEditor(superdesk: ISuperdesk): React.StatelessComponent<IEditorComponentProps> {
return function BelgaCoverageEditor(props: IEditorComponentProps) {
export function getBelgaCoverageEditor(superdesk: ISuperdesk): React.StatelessComponent<IEditorComponentProps<string | null, never>> {
return function BelgaCoverageEditor(props: IEditorComponentProps<string | null, never>) {
if (props.value) {
return (
<div>
Expand Down
Loading

0 comments on commit 1ddf863

Please sign in to comment.