TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-10-30 21:40:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change field-type into field-format in ui

Browse Source
This commit is contained in:
Eike Kettner
2020-11-24 21:29:36 +01:00
parent ff98c194e9
commit c389c8fe66
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
modules/webapp/src/main/elm/Comp/CustomFieldForm.elm
View File

@@ -212,7 +212,8 @@ view viewSettings model =
else
div []
[ text "Modify this custom field. Note that changing the type may result in data loss!"
[ text "Modify this custom field. Note that changing the format may "
, text "result in invisible values in the ui, if they don't comply to the new format!"
]
, div
[ classList
@@ -241,6 +242,18 @@ view viewSettings model =
, text "identifier, not contain spaces or weird characters."
]
]
, div [ class "required field" ]
[ label [] [ text "Field Format" ]
, Html.map FTypeMsg
(Comp.FixedDropdown.view
(Maybe.map mkItem model.ftype)
model.ftypeModel
)
, div [ class "small-info" ]
[ text "A field must have a format. Values are validated "
, text "according to this format."
]
]
, div [ class "field" ]
[ label [] [ text "Label" ]
, input
@@ -256,18 +269,6 @@ view viewSettings model =
, text "this field in the ui. If not present, the name is used."
]
]
, div [ class "required field" ]
[ label [] [ text "Field Type" ]
, Html.map FTypeMsg
(Comp.FixedDropdown.view
(Maybe.map mkItem model.ftype)
model.ftypeModel
)
, div [ class "small-info" ]
[ text "A field must have a type. This defines how to input values and "
, text "the server validates it according to this type."
]
]
]
++ (if viewSettings.showControls then
viewButtons model

2
modules/webapp/src/main/elm/Comp/CustomFieldTable.elm
View File

@@ -49,7 +49,7 @@ view _ items =
[ tr []
[ th [ class "collapsing" ] []
, th [] [ text "Name/Label" ]
, th [] [ text "Type" ]
, th [] [ text "Format" ]
, th [] [ text "#Usage" ]
, th [] [ text "Created" ]
]