This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new e6704ea Update parts.js.rb (#133)
e6704ea is described below
commit e6704ea38d61c03fbab7f8be80edf932401eabf1
Author: Craig L Russell <[email protected]>
AuthorDate: Sat Feb 19 17:42:28 2022 -0800
Update parts.js.rb (#133)
* Update parts.js.rb
Not ready to merge
* Update incomplete.json.rb
Update text description of reject reasons
* Update incomplete.json.rb
Typo on @@corporate_addpostal
* Document reject 2 1 (#134)
* Update incomplete.erb
Add reasons to reject a document.
* Update parts.js.rb
Change "incomplete" to "reject document"
Co-authored-by: sebbASF <[email protected]>
* Remove spurious end tags
Co-authored-by: sebbASF <[email protected]>
Co-authored-by: Sebb <[email protected]>
---
.../workbench/views/actions/incomplete.json.rb | 8 +++
www/secretary/workbench/views/parts.js.rb | 74 +++++++++++++++++++++-
2 files changed, 81 insertions(+), 1 deletion(-)
diff --git a/www/secretary/workbench/views/actions/incomplete.json.rb
b/www/secretary/workbench/views/actions/incomplete.json.rb
index 4b39211..cfdb430 100644
--- a/www/secretary/workbench/views/actions/incomplete.json.rb
+++ b/www/secretary/workbench/views/actions/incomplete.json.rb
@@ -15,6 +15,14 @@ _extract_project
REASONS = {
'@missing_address' => 'missing or incomplete postal address',
'@missing_email' => 'missing email address',
+ '@corporate_postal' => 'the postal address does not appear to be a personal
postal address',
+ '@invalid_public' => 'the public name should be a real name and not a user
id',
+ '@separate_signature' => 'the document and signature must be sent attached
to the same email',
+ '@unauthorized_signature' => 'the signature must be authorized, usually a
company executive',
+ '@empty_form' => 'the form appears to be completely empty',
+ '@unreadable_scan' => 'the scan is not readable or not complete',
+ '@wrong_identity' => 'the public key does not match the name/email on the
form',
+ '@validation_failed' => 'gpg validation failed',
}
# send rejection email
diff --git a/www/secretary/workbench/views/parts.js.rb
b/www/secretary/workbench/views/parts.js.rb
index e78cc88..7ea6438 100644
--- a/www/secretary/workbench/views/parts.js.rb
+++ b/www/secretary/workbench/views/parts.js.rb
@@ -14,6 +14,14 @@ class Parts < Vue
@project = nil
@missing_address = false
@missing_email = false
+ @corporate_postal = false
+ @invalid_public = false
+ @separate_signature = false
+ @unauthorized_signature = false
+ @empty_form = false
+ @unreadable_scan = false
+ @wrong_identity = false
+ @validation_failed = false
end
########################################################################
@@ -178,6 +186,14 @@ class Parts < Vue
_input type: 'hidden', name: 'signature', value: @@signature
_input type: 'hidden', name: 'missing_address', value:
@missing_address
_input type: 'hidden', name: 'missing_email', value: @missing_email
+ _input type: 'hidden', name: 'corporate_postal', value:
@corporate_postal
+ _input type: 'hidden', name: 'invalid_public', value:
@invalid_public
+ _input type: 'hidden', name: 'separate_signature', value:
@separate_signature
+ _input type: 'hidden', name: 'unauthorized_signature', value:
@unauthorized_signature
+ _input type: 'hidden', name: 'empty_form', value: @empty_form
+ _input type: 'hidden', name: 'unreadable_scan', value:
@unreadable_scan
+ _input type: 'hidden', name: 'wrong_identity', value:
@wrong_identity
+ _input type: 'hidden', name: 'validation_failed', value:
@validation_failed
# Defer processing (must be part of POST block)
@@ -204,7 +220,7 @@ class Parts < Vue
_label do
_input type: 'radio', name: 'doctype', value: 'incomplete',
onClick: self.reject
- _span 'incomplete form (select missing items below first)'
+ _span 'reject document (select reasons below)'
end
# The checked: variable names must be reflected in the file
incomplete.json.jb
@@ -223,6 +239,62 @@ class Parts < Vue
_span ' missing email address'
end
end
+ _li do
+ _label do
+ _input type: 'checkbox', checked: @corporate_postal,
+ onClick: -> {@corporate_postal = !@corporate_postal}
+ _span ' corporate postal address'
+ end
+ end
+ _li do
+ _label do
+ _input type: 'checkbox', checked: @invalid_public,
+ onClick: -> {@invalid_public = !@invalid_public}
+ _span ' invalid public name'
+ end
+ end
+ _li do
+ _label do
+ _input type: 'checkbox', checked: @separate_signature,
+ onClick: -> {@separate_signature = !@separate_signature}
+ _span ' separate document and signature'
+ end
+ end
+ _li do
+ _label do
+ _input type: 'checkbox', checked: @unauthorized_signature,
+ onClick: -> {@unauthorized_signature =
!@unauthorized_signature}
+ _span ' unauthorized signature'
+ end
+ end
+ _li do
+ _label do
+ _input type: 'checkbox', checked: @empty_form,
+ onClick: -> {@empty_form = !@empty_form}
+ _span ' empty form'
+ end
+ end
+ _li do
+ _label do
+ _input type: 'checkbox', checked: @unreadable_scan,
+ onClick: -> {@unreadable_scan = !@unreadable_scan}
+ _span ' unreadable or partial scan'
+ end
+ end
+ _li do
+ _label do
+ _input type: 'checkbox', checked: @wrong_identity,
+ onClick: -> {@wrong_identity = !@wrong_identity}
+ _span ' key data does not match email'
+ end
+ end
+ _li do
+ _label do
+ _input type: 'checkbox', checked: @validation_failed,
+ onClick: -> {@validation_failed = !@validation_failed}
+ _span ' gpg key validation failed'
+ end
+ end
end
_label do
