Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixing "Unique" and "Enforce Unique constraint" error message #3520

Merged
merged 16 commits into from
Jul 1, 2024
Merged

Fixing "Unique" and "Enforce Unique constraint" error message #3520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3a69a7e
bug fixing
VitorVieiraZ Jun 24, 2024
52489a2
small fix
VitorVieiraZ Jun 24, 2024
336db0f
removing push error
VitorVieiraZ Jun 24, 2024
84bdd3c
commenting bug fix
VitorVieiraZ Jun 25, 2024
b78a204
post review changes
VitorVieiraZ Jun 26, 2024
01a4bf3
last adjustment
VitorVieiraZ Jun 26, 2024
5bd8a2b
code adjust
VitorVieiraZ Jun 26, 2024
1c613af
error message visibility adjustment
VitorVieiraZ Jun 26, 2024
4d9d139
anything
VitorVieiraZ Jun 27, 2024
bb1cbd9
anything
VitorVieiraZ Jun 27, 2024
20bcee0
shouldShowValidationMsg to shouldShowValidation and states condition…
VitorVieiraZ Jun 27, 2024
956e36b
revert core/merginapi.cpp changes
VitorVieiraZ Jun 27, 2024
8837318
forcing new CI run
VitorVieiraZ Jun 28, 2024
74689ef
new CI run
VitorVieiraZ Jun 28, 2024
68c0d1a
new CI run
VitorVieiraZ Jun 28, 2024
d84fc78
gallery fix
VitorVieiraZ Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions app/qml/components/private/MMBaseInput.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Item {
property alias checkboxChecked: checkbox.checked

property bool readOnly: false
property bool shouldShowValidation: true

property string errorMsg: ""
property string warningMsg: ""
Expand Down Expand Up @@ -64,7 +65,7 @@ Item {
states: [
State {
name: "valid"
when: !warningMsg && !errorMsg
when: !shouldShowValidation || ( !warningMsg && !errorMsg )
},
State {
name: "error"
Expand Down Expand Up @@ -170,7 +171,7 @@ Item {
width: parent.width
height: validationMessagegroup.implicitHeight

visible: root.validationState !== "valid" && root.editState === "enabled"
visible: root.validationState !== "valid" && root.shouldShowValidation

RowLayout {
id: validationMessagegroup
Expand Down
4 changes: 3 additions & 1 deletion app/qml/form/MMFormPage.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,9 @@ Page {
property var fieldWidget: model.EditorWidget
property var fieldConfig: model.EditorWidgetConfig

property bool fieldIsReadOnly: root.state === "readOnly" || !AttributeEditable
property bool fieldFormIsReadOnly: root.state === "readOnly"
property bool fieldIsEditable: AttributeEditable

property bool fieldShouldShowTitle: model.ShowName

property string fieldTitle: model.Name
Expand Down
6 changes: 4 additions & 2 deletions app/qml/form/editors/MMFormCalendarEditor.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ MMPrivateComponents.MMBaseSingleLineInput {
property bool _fieldValueIsNull: parent.fieldValueIsNull

property bool _fieldShouldShowTitle: parent.fieldShouldShowTitle
property bool _fieldIsReadOnly: parent.fieldIsReadOnly
property bool _fieldFormIsReadOnly: parent.fieldFormIsReadOnly
property bool _fieldIsEditable: parent.fieldIsEditable

property string _fieldTitle: parent.fieldTitle
property string _fieldErrorMessage: parent.fieldErrorMessage
Expand All @@ -58,7 +59,8 @@ MMPrivateComponents.MMBaseSingleLineInput {
hasCheckbox: _fieldRememberValueSupported
checkboxChecked: _fieldRememberValueState

readOnly: _fieldIsReadOnly
readOnly: _fieldFormIsReadOnly || !_fieldIsEditable
shouldShowValidation: !_fieldFormIsReadOnly

onCheckboxCheckedChanged: {
root.rememberValueBoxClicked( checkboxChecked )
Expand Down
6 changes: 4 additions & 2 deletions app/qml/form/editors/MMFormNumberEditor.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ MMPrivateComponents.MMBaseSingleLineInput {
property bool _fieldValueIsNull: parent.fieldValueIsNull

property bool _fieldShouldShowTitle: parent.fieldShouldShowTitle
property bool _fieldIsReadOnly: parent.fieldIsReadOnly
property bool _fieldFormIsReadOnly: parent.fieldFormIsReadOnly
property bool _fieldIsEditable: parent.fieldIsEditable

property string _fieldTitle: parent.fieldTitle
property string _fieldErrorMessage: parent.fieldErrorMessage
Expand All @@ -41,7 +42,8 @@ MMPrivateComponents.MMBaseSingleLineInput {
signal rememberValueBoxClicked( bool state )

title: _fieldShouldShowTitle ? _fieldTitle : ""
readOnly: _fieldIsReadOnly
readOnly: _fieldFormIsReadOnly || !_fieldIsEditable
shouldShowValidation: !_fieldFormIsReadOnly

errorMsg: _fieldErrorMessage
warningMsg: _fieldWarningMessage
Expand Down
6 changes: 4 additions & 2 deletions app/qml/form/editors/MMFormPhotoEditor.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ MMFormPhotoViewer {
property var _fieldFeatureLayerPair: parent.fieldFeatureLayerPair

property bool _fieldShouldShowTitle: parent.fieldShouldShowTitle
property bool _fieldIsReadOnly: parent.fieldIsReadOnly
property bool _fieldFormIsReadOnly: parent.fieldFormIsReadOnly
property bool _fieldIsEditable: parent.fieldIsEditable

property string _fieldTitle: parent.fieldTitle
property string _fieldErrorMessage: parent.fieldErrorMessage
Expand All @@ -80,7 +81,8 @@ MMFormPhotoViewer {
warningMsg: photoState === "notAvailable" ? qsTr( "Photo is missing." ) : _fieldWarningMessage
errorMsg: _fieldErrorMessage

readOnly: _fieldIsReadOnly
readOnly: _fieldFormIsReadOnly || !_fieldIsEditable
shouldShowValidation: !_fieldFormIsReadOnly

hasCheckbox: _fieldRememberValueSupported
checkboxChecked: _fieldRememberValueState
Expand Down
6 changes: 4 additions & 2 deletions app/qml/form/editors/MMFormRelationReferenceEditor.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ MMPrivateComponents.MMBaseSingleLineInput {
property var _fieldConfig: parent.fieldConfig
property var _fieldActiveProject: parent.fieldActiveProject

property bool _fieldIsReadOnly: parent.fieldIsReadOnly
property bool _fieldFormIsReadOnly: parent.fieldFormIsReadOnly
property bool _fieldIsEditable: parent.fieldIsEditable

property bool _fieldShouldShowTitle: parent.fieldShouldShowTitle
property string _fieldTitle: parent.fieldTitle
Expand All @@ -45,7 +46,8 @@ MMPrivateComponents.MMBaseSingleLineInput {
errorMsg: _fieldErrorMessage
warningMsg: _fieldWarningMessage

readOnly: _fieldIsReadOnly
readOnly: _fieldFormIsReadOnly || !_fieldIsEditable
shouldShowValidation: !_fieldFormIsReadOnly

hasCheckbox: _fieldRememberValueSupported
checkboxChecked: _fieldRememberValueState
Expand Down
6 changes: 4 additions & 2 deletions app/qml/form/editors/MMFormScannerEditor.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ MMPrivateComponents.MMBaseSingleLineInput {
property bool _fieldValueIsNull: parent.fieldValueIsNull

property bool _fieldShouldShowTitle: parent.fieldShouldShowTitle
property bool _fieldIsReadOnly: parent.fieldIsReadOnly
property bool _fieldFormIsReadOnly: parent.fieldFormIsReadOnly
property bool _fieldIsEditable: parent.fieldIsEditable

property string _fieldTitle: parent.fieldTitle
property string _fieldErrorMessage: parent.fieldErrorMessage
Expand All @@ -45,7 +46,8 @@ MMPrivateComponents.MMBaseSingleLineInput {
warningMsg: _fieldWarningMessage
errorMsg: _fieldErrorMessage

readOnly: _fieldIsReadOnly
readOnly: _fieldFormIsReadOnly || !_fieldIsEditable
shouldShowValidation: !_fieldFormIsReadOnly

hasCheckbox: _fieldRememberValueSupported
checkboxChecked: _fieldRememberValueState
Expand Down
6 changes: 4 additions & 2 deletions app/qml/form/editors/MMFormSliderEditor.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ MMPrivateComponents.MMBaseSingleLineInput {
property var _fieldConfig: parent.fieldConfig

property bool _fieldShouldShowTitle: parent.fieldShouldShowTitle
property bool _fieldIsReadOnly: parent.fieldIsReadOnly
property bool _fieldFormIsReadOnly: parent.fieldFormIsReadOnly
property bool _fieldIsEditable: parent.fieldIsEditable

property string _fieldTitle: parent.fieldTitle
property string _fieldErrorMessage: parent.fieldErrorMessage
Expand All @@ -45,7 +46,8 @@ MMPrivateComponents.MMBaseSingleLineInput {
warningMsg: _fieldWarningMessage
errorMsg: _fieldErrorMessage

readOnly: _fieldIsReadOnly
readOnly: _fieldFormIsReadOnly || !_fieldIsEditable
shouldShowValidation: !_fieldFormIsReadOnly

hasCheckbox: _fieldRememberValueSupported
checkboxChecked: _fieldRememberValueState
Expand Down
6 changes: 4 additions & 2 deletions app/qml/form/editors/MMFormSwitchEditor.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ MMSwitchInput {
property var _fieldConfig: parent.fieldConfig

property bool _fieldShouldShowTitle: parent.fieldShouldShowTitle
property bool _fieldIsReadOnly: parent.fieldIsReadOnly
property bool _fieldFormIsReadOnly: parent.fieldFormIsReadOnly
property bool _fieldIsEditable: parent.fieldIsEditable

property string _fieldTitle: parent.fieldTitle
property string _fieldErrorMessage: parent.fieldErrorMessage
Expand All @@ -45,7 +46,8 @@ MMSwitchInput {
warningMsg: _fieldWarningMessage
errorMsg: _fieldErrorMessage

readOnly: _fieldIsReadOnly
readOnly: _fieldFormIsReadOnly || !_fieldIsEditable
shouldShowValidation: !_fieldFormIsReadOnly

hasCheckbox: _fieldRememberValueSupported
checkboxChecked: _fieldRememberValueState
Expand Down
6 changes: 4 additions & 2 deletions app/qml/form/editors/MMFormTextEditor.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ MMPrivateComponents.MMBaseSingleLineInput {
property bool _fieldValueIsNull: parent.fieldValueIsNull

property bool _fieldShouldShowTitle: parent.fieldShouldShowTitle
property bool _fieldIsReadOnly: parent.fieldIsReadOnly
property bool _fieldFormIsReadOnly: parent.fieldFormIsReadOnly
property bool _fieldIsEditable: parent.fieldIsEditable

property string _fieldTitle: parent.fieldTitle
property string _fieldErrorMessage: parent.fieldErrorMessage
Expand All @@ -43,7 +44,8 @@ MMPrivateComponents.MMBaseSingleLineInput {

text: _fieldValue === undefined || _fieldValueIsNull ? '' : _fieldValue

readOnly: _fieldIsReadOnly
readOnly: _fieldFormIsReadOnly || !_fieldIsEditable
shouldShowValidation: !_fieldFormIsReadOnly

title: _fieldShouldShowTitle ? _fieldTitle : ""

Expand Down
6 changes: 4 additions & 2 deletions app/qml/form/editors/MMFormTextMultilineEditor.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ MMPrivateComponents.MMBaseInput {
property bool _fieldValueIsNull: parent.fieldValueIsNull

property bool _fieldShouldShowTitle: parent.fieldShouldShowTitle
property bool _fieldIsReadOnly: parent.fieldIsReadOnly
property bool _fieldFormIsReadOnly: parent.fieldFormIsReadOnly
property bool _fieldIsEditable: parent.fieldIsEditable

property string _fieldTitle: parent.fieldTitle
property string _fieldErrorMessage: parent.fieldErrorMessage
Expand All @@ -49,7 +50,8 @@ MMPrivateComponents.MMBaseInput {
warningMsg: _fieldWarningMessage
errorMsg: _fieldErrorMessage

readOnly: _fieldIsReadOnly
readOnly: _fieldFormIsReadOnly || !_fieldIsEditable
shouldShowValidation: !_fieldFormIsReadOnly

hasCheckbox: _fieldRememberValueSupported
checkboxChecked: _fieldRememberValueState
Expand Down
6 changes: 4 additions & 2 deletions app/qml/form/editors/MMFormValueMapEditor.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ MMFormComboboxBaseEditor {
property bool _fieldValueIsNull: parent.fieldValueIsNull

property bool _fieldShouldShowTitle: parent.fieldShouldShowTitle
property bool _fieldIsReadOnly: parent.fieldIsReadOnly
property bool _fieldFormIsReadOnly: parent.fieldFormIsReadOnly
property bool _fieldIsEditable: parent.fieldIsEditable

property string _fieldTitle: parent.fieldTitle
property string _fieldErrorMessage: parent.fieldErrorMessage
Expand All @@ -47,7 +48,8 @@ MMFormComboboxBaseEditor {
errorMsg: _fieldErrorMessage
warningMsg: _fieldWarningMessage

readOnly: _fieldIsReadOnly
readOnly: _fieldFormIsReadOnly || !_fieldIsEditable
shouldShowValidation: !_fieldFormIsReadOnly

hasCheckbox: _fieldRememberValueSupported
checkboxChecked: _fieldRememberValueState
Expand Down
6 changes: 4 additions & 2 deletions app/qml/form/editors/MMFormValueRelationEditor.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ MMFormComboboxBaseEditor {
property var _fieldFeatureLayerPair: parent.fieldFeatureLayerPair

property bool _fieldShouldShowTitle: parent.fieldShouldShowTitle
property bool _fieldIsReadOnly: parent.fieldIsReadOnly
property bool _fieldFormIsReadOnly: parent.fieldFormIsReadOnly
property bool _fieldIsEditable: parent.fieldIsEditable

property string _fieldTitle: parent.fieldTitle
property string _fieldErrorMessage: parent.fieldErrorMessage
Expand All @@ -48,7 +49,8 @@ MMFormComboboxBaseEditor {
errorMsg: _fieldErrorMessage
warningMsg: _fieldWarningMessage

readOnly: _fieldIsReadOnly
readOnly: _fieldFormIsReadOnly || !_fieldIsEditable
shouldShowValidation: !_fieldFormIsReadOnly

hasCheckbox: _fieldRememberValueSupported
checkboxChecked: _fieldRememberValueState
Expand Down
3 changes: 2 additions & 1 deletion gallery/qml/components/EditorItem.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ Item {
property string fieldValue: ""
property var fieldConfig: ({UseHtml: true})
property bool fieldShouldShowTitle: checkboxTitle.checked
property bool fieldIsReadOnly: !checkbox.checked
property bool fieldFormIsReadOnly: !checkbox.checked
property bool fieldIsEditable: checkboxEditable.checked
property string fieldErrorMessage: checkboxError.checked ? "error" : ""
property string fieldWarningMessage: checkboxWarning.checked ? "warning" : ""
property bool fieldRememberValueSupported: checkboxRemember.checked
Expand Down
6 changes: 6 additions & 0 deletions gallery/qml/pages/EditorsPage.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@ ScrollView {
checked: false
}

MMCheckBox {
id: checkboxEditable
text: checked ? "attribute editable: yes" : "attribute editable: no"
checked: true
}

GalleryComponents.EditorItem {
width: parent.width
height: relationEditor.height
Expand Down
Loading