[whimsy] branch master updated: WHIMSY-282 - ICLAs not considered duplicate if the emails match

[se...@apache.org]

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 dcca241  WHIMSY-282 - ICLAs not considered duplicate if the emails match
dcca241 is described below

commit dcca24104ef5222372c9f572b2431cfeab0fb26a
Author: Sebb <se...@apache.org>
AuthorDate: Thu Jul 25 19:06:12 2019 +0100

    WHIMSY-282 - ICLAs not considered duplicate if the emails match
---
 www/secretary/workbench/views/actions/icla.json.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/www/secretary/workbench/views/actions/icla.json.rb b/www/secretary/workbench/views/actions/icla.json.rb
index 7d8bb83..c043a84 100644
--- a/www/secretary/workbench/views/actions/icla.json.rb
+++ b/www/secretary/workbench/views/actions/icla.json.rb
@@ -25,6 +25,11 @@ if "#@filename#{fileext}" =~ /\w[-\w]*\.?\w*/
     file = Dir["#{icladir}.*"]
     if file.any?
       _warn "documents/iclas/#{File.basename(file.first)} already exists"
+    else
+      _icla = ASF::ICLA.find_by_email(@email.strip)
+      if _icla
+        _warn "Email #{@email.strip} found in iclas.txt file - #{_icla.as_line}"
+      end
     end
   end
 else