Skip to content

Commit 77635f9

Browse files
author
holivier
committed
Improved: event-update-area (field and form level): add close-modal as event-type (OFBIZ-11767)
it's a click event, when click one or all open modal area closed. it's use for lookup and for modal created with link with layered-modal No modification in renderer in this commit
1 parent fa39c14 commit 77635f9

File tree

3 files changed

+4
-0
lines changed

3 files changed

+4
-0
lines changed

framework/widget/dtd/widget-form.xsd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -618,6 +618,7 @@ under the License.
618618
<xs:enumeration value="set-watcher" />
619619
<xs:enumeration value="refresh-watcher" />
620620
<xs:enumeration value="collapse" />
621+
<xs:enumeration value="close-modal" />
621622
</xs:restriction>
622623
</xs:simpleType>
623624
</xs:attribute>
@@ -1591,6 +1592,7 @@ under the License.
15911592
<xs:enumeration value="submit" />
15921593
<xs:enumeration value="set-field-in-form" />
15931594
<xs:enumeration value="collapse" />
1595+
<xs:enumeration value="close-modal" />
15941596
</xs:restriction>
15951597
</xs:simpleType>
15961598
</xs:attribute>

framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,7 @@ protected ModelForm(Element formElement, String formLocation, ModelReader entity
436436
||"set-watcher".equals(updateArea.getEventType())
437437
||"refresh-watcher".equals(updateArea.getEventType())
438438
||"collapse".equals(updateArea.getEventType())
439+
||"close-modal".equals(updateArea.getEventType())
439440
) {
440441
int index = onSubmitUpdateAreas.indexOf(updateArea);
441442
if (index != -1) {

framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormFieldBuilder.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ public ModelFormFieldBuilder(Element fieldElement, ModelForm modelForm, ModelRea
225225
|| "submit".equals(updateArea.getEventType())
226226
|| "set-field-in-form".equals(updateArea.getEventType())
227227
|| "collapse".equals(updateArea.getEventType())
228+
|| "close-modal".equals(updateArea.getEventType())
228229
) {
229230
onClickUpdateAreas.add(updateArea);
230231
}

0 commit comments

Comments
 (0)