MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix/couchdb-image-build

This commit is contained in:
Michael Drury 2023-10-18 15:20:18 +01:00 committed by GitHub
parent 705c948de7 5cd22672b3
commit a8b13ec8e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -1,5 +1,5 @@
{ {
"version": "2.11.37", "version": "2.11.38",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*" "packages/*"

2
packages/builder/src/pages/builder/auth/forgot.svelte
View File

@ -43,7 +43,7 @@
}) })
</script> </script>
<TestimonialPage> <TestimonialPage enabled={$organisation.testimonialsEnabled}>
<Layout gap="S" noPadding> <Layout gap="S" noPadding>
<img alt="logo" src={$organisation.logoUrl || Logo} /> <img alt="logo" src={$organisation.logoUrl || Logo} />
<span class="heading-wrap"> <span class="heading-wrap">

2
packages/builder/src/pages/builder/auth/reset.svelte
View File

@ -53,7 +53,7 @@
}) })
</script> </script>
<TestimonialPage> <TestimonialPage enabled={$organisation.testimonialsEnabled}>
<Layout gap="S" noPadding> <Layout gap="S" noPadding>
{#if loaded} {#if loaded}
<img alt="logo" src={$organisation.logoUrl || Logo} /> <img alt="logo" src={$organisation.logoUrl || Logo} />

50
packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte
View File

@ -260,29 +260,31 @@
class:wrap={editable || contentLines > 1} class:wrap={editable || contentLines > 1}
on:wheel={e => (focused ? e.stopPropagation() : null)} on:wheel={e => (focused ? e.stopPropagation() : null)}
> >
{#each value || [] as relationship} {#if Array.isArray(value) && value.length}
{#if relationship[primaryDisplay] || relationship.primaryDisplay} {#each value as relationship}
<div class="badge"> {#if relationship[primaryDisplay] || relationship.primaryDisplay}
<span <div class="badge">
on:click={editable <span
? () => showRelationship(relationship._id) on:click={editable
: null} ? () => showRelationship(relationship._id)
> : null}
{readable( >
relationship[primaryDisplay] || relationship.primaryDisplay {readable(
)} relationship[primaryDisplay] || relationship.primaryDisplay
</span> )}
{#if editable} </span>
<Icon {#if editable}
name="Close" <Icon
size="XS" name="Close"
hoverable size="XS"
on:click={() => toggleRow(relationship)} hoverable
/> on:click={() => toggleRow(relationship)}
{/if} />
</div> {/if}
{/if} </div>
{/each} {/if}
{/each}
{/if}
{#if editable} {#if editable}
<div class="add" on:click={open}> <div class="add" on:click={open}>
<Icon name="Add" size="S" /> <Icon name="Add" size="S" />
@ -318,7 +320,7 @@
<div class="searching"> <div class="searching">
<ProgressCircle size="S" /> <ProgressCircle size="S" />
</div> </div>
{:else if searchResults?.length} {:else if Array.isArray(searchResults) && searchResults.length}
<div class="results"> <div class="results">
{#each searchResults as row, idx} {#each searchResults as row, idx}
<div <div