[pmg-devel] [PATCH pmg-gui 0/2] fix regex tester

[pmg-devel] [PATCH pmg-gui 0/2] fix regex tester

[Stoiko Ivanov]

this series fixes a small glitch with the regex-tester:
* the query for the regexField did not yield the right value, since the
  component is usually inserted before the regex-tester
* the first patch fixes building if .lint-incremental does not exist (yet)

Stoiko Ivanov (2):
  buildsys: rm -f .lint-incremental
  RegexTester: find correct component

 js/Makefile       | 2 +-
 js/RegexTester.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
2.20.1

[pmg-devel] [PATCH pmg-gui 1/2] buildsys: rm -f .lint-incremental

[Stoiko Ivanov]

else the build fails if the file does not exist

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 js/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/Makefile b/js/Makefile
index d62e827..e60d638 100644
--- a/js/Makefile
+++ b/js/Makefile
@@ -102,7 +102,7 @@ lint: .lint-incremental
 
 .PHONY: check
 check: ${JSSRC}
-	rm ".lint-incremental"
+	rm -f ".lint-incremental"
 	$(MAKE) lint
 
 pmgmanagerlib.js: OnlineHelpInfo.js ${JSSRC}
-- 
2.20.1

[pmg-devel] [PATCH pmg-gui 2/2] RegexTester: find correct component

[Stoiko Ivanov]

the regular expression field is not necessarily after the regex tester
(mostly it is before). In order to be more robust, use child instead of
previousSibling

Tested with:
* mailproxy whitelist
* match field
* match filename
* who object

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
Thanks to Dominik for pointing me in the right direction!

 js/RegexTester.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/RegexTester.js b/js/RegexTester.js
index 3b03f6d..486c197 100644
--- a/js/RegexTester.js
+++ b/js/RegexTester.js
@@ -26,7 +26,7 @@ Ext.define('PMG.RegexTester', {
 	    text: 'Test',
 	    handler: function(btn) {
 		let view = this.up();
-		let regexField = btn.nextSibling(`field[reference=${view.regexFieldReference}]`);
+		let regexField = view.up().child(`field[reference=${view.regexFieldReference}]`);
 
 		let regex = regexField.getValue();
 		if (view.wholeMatch) {
-- 
2.20.1

[pmg-devel] applied: [PATCH pmg-gui 1/2] buildsys: rm -f .lint-incremental

[Thomas Lamprecht]

On 12.11.20 18:57, Stoiko Ivanov wrote:
> else the build fails if the file does not exist
> 
> Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
> ---
>  js/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
>

applied, thanks!

[pmg-devel] applied: [PATCH pmg-gui 2/2] RegexTester: find correct component

[Thomas Lamprecht]

On 12.11.20 18:57, Stoiko Ivanov wrote:
> the regular expression field is not necessarily after the regex tester
> (mostly it is before). In order to be more robust, use child instead of
> previousSibling
> 
> Tested with:
> * mailproxy whitelist
> * match field
> * match filename
> * who object
> 
> Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
> ---
> Thanks to Dominik for pointing me in the right direction!
> 
>  js/RegexTester.js | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
>

applied, thanks! added/fixed a bit to the commit message, among others to
clarify that not the wrong component was returned.