Skip to content
This repository has been archived by the owner on Jul 26, 2024. It is now read-only.

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
phorward committed Jul 26, 2019
2 parents f0c03c7 + b254f64 commit e9e028a
Show file tree
Hide file tree
Showing 17 changed files with 595 additions and 41 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
htmleditor/*.js linguist-vendored
16 changes: 15 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,19 @@ This file documents any relevant changes done to ViUR Vi since version 2.

This is the current development version.

## [2.5.0] Vesuv

Release date: Jul 26, 2019

- Feature: Support for new recordBone()
- Bugfix: Improved `textBone.unserialize()` and change-event behavior
- Bugfix: Widget for `stringBone(multiple=True)` is now cleared on unserialization
- Bugfix: Added missing `serializeForDocument()` to spatialBone
- Bugfix: SelectMultiBoneExtractor.render() works now correctly for `selectBone(multiple=True)`
- Bugfix: Disallow applying SelectFieldsPopup with empty selection (#27)
- Bugfix: Selection in SelectTable works now correctly
- Bugfix: On server version mismatch, allow to continue anyway

## [2.4.1] Agung

Release date: May 24, 2019
Expand Down Expand Up @@ -111,7 +124,8 @@ Release date: Dec 22, 2016
- Styling


[develop]: https://github.com/viur-framework/vi/compare/v2.4.1...develop
[develop]: https://github.com/viur-framework/vi/compare/v2.5.0...develop
[2.5.0]: https://github.com/viur-framework/vi/compare/v2.4.1...v2.5.0
[2.4.1]: https://github.com/viur-framework/vi/compare/v2.4.0...v2.4.1
[2.4.0]: https://github.com/viur-framework/vi/compare/v2.3.0...v2.4.0
[2.3.0]: https://github.com/viur-framework/vi/compare/v2.2.0...v2.3.0
Expand Down
12 changes: 9 additions & 3 deletions actions/list.py
Original file line number Diff line number Diff line change
Expand Up @@ -494,14 +494,20 @@ def __init__(self, listWdg, *args, **kwargs):
self.appendChild(self.cancelBtn)

def doApply(self, *args, **kwargs):
self.applyBtn["class"].append("is_loading")
self.applyBtn["disabled"] = True

res = []
for c in self.checkboxes:
if c["checked"]:
res.append( c["value"] )

if not res:
html5.ext.Alert(
translate("You have to select at least on field to continue!")
)
return

self.applyBtn["class"].append("is_loading")
self.applyBtn["disabled"] = True

self.listWdg.setFields( res )
self.close()

Expand Down
1 change: 1 addition & 0 deletions bones/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
from bones import base
from bones import relational
from bones import record
from bones import file
from bones import hierarchy
from bones import selectmulti
Expand Down
Loading

0 comments on commit e9e028a

Please sign in to comment.