Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,10 @@ COPY --from=build-backend /opt/specify7 /opt/specify7
WORKDIR /opt/specify7
RUN cp -r specifyweb/settings .

ENV PATH="/opt/specify7/ve/bin:$PATH"

RUN echo 'export PATH="/opt/specify7/ve/bin:$PATH"' > ~/.bashrc

RUN echo \
"import os" \
"\nfrom . import specify_settings as specify_defaults" \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ export function RecordSetAttachments<SCHEMA extends AnySchema>({

const isComplete = fetchedCount.current === recordCount;

const [showCreateRecordSetDialog, setShowCreateRecordSetDialog] = React.useState(false);
const [showCreateRecordSetDialog, setShowCreateRecordSetDialog] =
React.useState(false);

return (
<>
Expand All @@ -133,16 +134,17 @@ export function RecordSetAttachments<SCHEMA extends AnySchema>({
<Button.Info
title={attachmentsText.downloadAllDescription()}
onClick={(): void =>
(recordSetId === undefined && !isComplete) ?
setShowCreateRecordSetDialog(true)
:
loading(
downloadAllAttachments(
(recordSetId !== undefined && !isComplete) ? [] : attachmentsRef.current?.attachments ?? [],
name,
recordSetId,
)
)
recordSetId === undefined && !isComplete
? setShowCreateRecordSetDialog(true)
: loading(
downloadAllAttachments(
recordSetId !== undefined && !isComplete
? []
: (attachmentsRef.current?.attachments ?? []),
name,
recordSetId
)
)
}
>
{attachmentsText.downloadAll()}
Expand All @@ -157,15 +159,15 @@ export function RecordSetAttachments<SCHEMA extends AnySchema>({
header={
attachmentsRef.current?.attachments === undefined
? attachmentsText.attachments()
: (isComplete ?
commonText.countLine({
resource: attachmentsText.attachments(),
count: attachmentsRef.current.attachments.length
}) :
commonText.countLineOrMore({
resource: attachmentsText.attachments(),
count: attachmentsRef.current.attachments.length
}))
: isComplete
? commonText.countLine({
resource: attachmentsText.attachments(),
count: attachmentsRef.current.attachments.length,
})
: commonText.countLineOrMore({
resource: attachmentsText.attachments(),
count: attachmentsRef.current.attachments.length,
})
}
onClose={handleHideAttachments}
>
Expand Down Expand Up @@ -215,13 +217,11 @@ function CreateRecordSetDialog({
}): JSX.Element {
return (
<Dialog
buttons={
<Button.DialogClose>{commonText.close()}</Button.DialogClose>
}
buttons={<Button.DialogClose>{commonText.close()}</Button.DialogClose>}
header={attachmentsText.downloadAll()}
onClose={onClose}
>
{attachmentsText.createRecordSetToDownloadAll()}
</Dialog>
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,6 @@ const containsSystemTables = (queryFieldSpec: QueryFieldSpec) => {
return Boolean(baseIsBlocked || pathHasBlockedSystem);
};


const hasHierarchyBaseTable = (queryFieldSpec: QueryFieldSpec) =>
Object.keys(schema.domainLevelIds).includes(
queryFieldSpec.baseTable.name.toLowerCase() as 'collection'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ export const fieldFormattersSpec = f.store(() =>
? javaClass
: undefined),
rawAutoNumber: formatter.parts.some(isAutoNumbering)
? legacyAutoNumber ??
inferLegacyAutoNumber(table, formatter.parts)
? (legacyAutoNumber ??
inferLegacyAutoNumber(table, formatter.parts))
: undefined,
})
),
Expand Down Expand Up @@ -149,10 +149,10 @@ export function normalizeFieldFormatterPart(
part.type === 'regex'
? localized(trimRegexString(part.placeholder))
: part.type === 'year'
? fieldFormatterTypeMapper.year.placeholder
: part.type === 'numeric'
? fieldFormatterTypeMapper.numeric.buildPlaceholder(part.size)
: part.placeholder;
? fieldFormatterTypeMapper.year.placeholder
: part.type === 'numeric'
? fieldFormatterTypeMapper.numeric.buildPlaceholder(part.size)
: part.placeholder;
const size = fieldFormatterTypesWithForcedSize.has(part.type as 'constant')
? placeholder.length
: part.size;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ export const makeXmlEditorShellSlot = <
readonly title: string | undefined;
readonly isDefault: boolean;
readonly table: SpecifyTable | undefined;
}
},
>(
children: (getSet: GetSet<ITEM>) => JSX.Element,
index: string | undefined,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,14 +114,14 @@ function WbSpreadsheetComponent({
: label;
// REFACTOR: use new table icons
const tableSvg = renderToStaticMarkup(
<SvgIcon
className={iconClassName}
label={tableLabel}
name={strictGetTable(tableName).name }
/>
);
<SvgIcon
className={iconClassName}
label={tableLabel}
name={strictGetTable(tableName).name}
/>
);

return `<a
return `<a
class="link"
href="/specify/view/${tableName}/${recordId}/"
target="_blank"
Expand Down
Loading