Skip to content
Snippets Groups Projects
Commit a6e9d270 authored by Allen Gilliland's avatar Allen Gilliland
Browse files

little bit of final cleanup.

parent 198ec1fa
No related branches found
No related tags found
No related merge requests found
......@@ -55,7 +55,7 @@
:field_type field_type
:special_type special_type
:visibility_type visibility_type}
(when display_name {:display_name display_name}))))
(when display_name {:display_name display_name}))))
(Field id))))
(defendpoint GET "/:id/summary"
......
......@@ -55,7 +55,6 @@
(defendpoint GET "/:id/fields"
"Get all `Fields` for `Table` with ID."
[id]
;; TODO: check that order doesn't change in a problematic way due to sorting by position
(let-404 [table (Table id)]
(read-check table)
(sel :many Field :table_id id, :visibility_type [not-in ["sensitive" "retired"]], (k/order :name :ASC))))
......
......@@ -172,9 +172,9 @@
(qp (if-not (should-add-implicit-fields? query)
query
(let [fields (for [field (db/sel :many :fields [Field :name :display_name :base_type :special_type :visibility_type :display_name :table_id :id :position :description]
:table_id source-table-id
:table_id source-table-id
:visibility_type [not-in ["sensitive" "retired"]]
:parent_id nil
:parent_id nil
(k/order :position :asc) (k/order :id :desc))]
(let [field (-> (resolve/rename-mb-field-keys field)
map->Field
......
......@@ -47,7 +47,6 @@
"Return the `FieldValues` for all `Fields` belonging to TABLE."
{:hydrate :field_values, :arglists '([table])}
[{:keys [id]}]
;; TODO: any reason to return field-values for other visibility options?
(let [field-ids (db/sel :many :id Field, :table_id id, :visibility_type "normal"
(k/order :position :asc)
(k/order :name :asc))]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment