diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2014-11-03 19:44:38 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2014-11-03 19:44:38 +0000 |
| commit | c972d26748437e3bcd3bae1effefd85893aa69f8 (patch) | |
| tree | 3f9b022b32d75ef94ed4c867739a51726e977248 | |
| parent | d0ce28f1669342c00922c378f82824ba503c338f (diff) | |
| download | acf-db-c972d26748437e3bcd3bae1effefd85893aa69f8.tar.bz2 acf-db-c972d26748437e3bcd3bae1effefd85893aa69f8.tar.xz | |
Check with database and only display default and null options if applicable
| -rw-r--r-- | lib/db-createtableentry-html.lsp | 1 | ||||
| -rw-r--r-- | lib/dbmodelfunctions.lua | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lib/db-createtableentry-html.lsp b/lib/db-createtableentry-html.lsp index f9a2456..208ed4a 100644 --- a/lib/db-createtableentry-html.lsp +++ b/lib/db-createtableentry-html.lsp @@ -58,7 +58,6 @@ for x,name in ipairs(order) do htmlviewfunctions.displayitemmiddle(myitem, nil, header_level2) htmlviewfunctions.displayformitem(myitem, name, -1, "fields") if not myitem.readonly and form.value.defaults and form.value.defaults.value[name] then - form.value.defaults.value[name].descr = "Default" form.value.defaults.value[name].class = "defaults" htmlviewfunctions.displayformitem(form.value.defaults.value[name], name, -1, "defaults") end diff --git a/lib/dbmodelfunctions.lua b/lib/dbmodelfunctions.lua index c1da6ed..2b21a23 100644 --- a/lib/dbmodelfunctions.lua +++ b/lib/dbmodelfunctions.lua @@ -153,11 +153,15 @@ function mymodule.get_new_table_entry(dbase, self, clientdata) retval.value.fields = cfe({ type="group", value={}, label="Table Fields", seq=2 }) retval.value.nulls = cfe({ type="group", value={}, label="Null Value Table Fields", seq=3 }) retval.value.defaults = cfe({ type="group", value={}, label="Default Value Table Fields", seq=4 }) - local fields = db.listcolumns(retval.value.table.value) + local fields, defaults, nullable = db.listcolumns(retval.value.table.value) for i,f in ipairs(fields) do retval.value.fields.value[f] = cfe({ label=f, seq=i }) - retval.value.nulls.value[f] = cfe({ type="boolean", value=false, label=f, seq=i }) - retval.value.defaults.value[f] = cfe({ type="boolean", value=false, label=f, seq=i }) + if nullable[f] then + retval.value.nulls.value[f] = cfe({ type="boolean", value=false, label=f, seq=i }) + end + if defaults[f] then + retval.value.defaults.value[f] = cfe({ type="boolean", value=false, label=f, default=defaults[f], seq=i }) + end end end if connected then db.databasedisconnect() end |