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

Merge branch 'feat/linked-records-data-source' of github.com:Budibase/budibase into endpoint-renaming

This commit is contained in:
mike12345567 2020-10-13 09:58:31 +01:00
parent 5e9d32824c 0aeed3241e
commit ca9012d07d
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/builder/src/components/backend/DataTable/TablePagination.svelte
View File

@ -24,7 +24,6 @@
} }
function getPagesAroundCurrent(current, max) { function getPagesAroundCurrent(current, max) {
console.log(current)
const start = Math.max(current - 2, 1) const start = Math.max(current - 2, 1)
const end = Math.min(current + 2, max - 2) const end = Math.min(current + 2, max - 2)
let pages = [] let pages = []

12
packages/builder/src/components/userInterface/temporaryPanelStructure.js
View File

@ -305,7 +305,7 @@ export default {
design: { ...all }, design: { ...all },
settings: [ settings: [
{ {
label: "Table", label: "Data",
key: "datasource", key: "datasource",
control: TableViewSelect, control: TableViewSelect,
}, },
@ -587,7 +587,7 @@ export default {
design: { ...all }, design: { ...all },
settings: [ settings: [
{ {
label: "Table", label: "Data",
key: "datasource", key: "datasource",
control: TableViewSelect, control: TableViewSelect,
}, },
@ -659,7 +659,7 @@ export default {
properties: { properties: {
settings: [ settings: [
{ {
label: "Table", label: "Data",
key: "datasource", key: "datasource",
control: TableViewSelect, control: TableViewSelect,
}, },
@ -753,7 +753,7 @@ export default {
properties: { properties: {
settings: [ settings: [
{ {
label: "Table", label: "Data",
key: "datasource", key: "datasource",
control: TableViewSelect, control: TableViewSelect,
}, },
@ -867,7 +867,7 @@ export default {
properties: { properties: {
settings: [ settings: [
{ {
label: "Table", label: "Data",
key: "datasource", key: "datasource",
control: TableViewSelect, control: TableViewSelect,
}, },
@ -970,7 +970,7 @@ export default {
properties: { properties: {
settings: [ settings: [
{ {
label: "Table", label: "Data",
key: "datasource", key: "datasource",
control: TableViewSelect, control: TableViewSelect,
}, },

18
packages/server/src/utilities/fileProcessor.js
View File

@ -1,5 +1,5 @@
const fs = require("fs") const fs = require("fs")
// const sharp = require("sharp") const sharp = require("sharp")
const fsPromises = fs.promises const fsPromises = fs.promises
const FORMATS = { const FORMATS = {
@ -7,14 +7,14 @@ const FORMATS = {
} }
async function processImage(file) { async function processImage(file) {
// const imgMeta = await sharp(file.path) const imgMeta = await sharp(file.path)
// .resize(300) .resize(300)
// .toFile(file.outputPath) .toFile(file.outputPath)
//
// return { return {
// ...file, ...file,
// ...imgMeta, ...imgMeta,
// } }
} }
async function process(file) { async function process(file) {