glexchange 4.18.1 → 4.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a403a30d88812d456f7bc93ca205df9a6eb36713
-  data.tar.gz: bb7b469d5b6766a767154c299bdd506db4a24132
+  metadata.gz: 6f1bc70a6bd32c406bb7d2d0ac0a67c7fe6953be
+  data.tar.gz: 301c369520979c3afbd211b5d50fdc59e154faf3
 SHA512:
-  metadata.gz: b9d0e8f7d24de6f80ebbbd52ea0083d2478d433f1132dfad449bb5bdde77ce2b2eb87b9f92de5695a80776ad7c1a12119114a2cc6616d841698f156cd3650363
-  data.tar.gz: 0feb41fd559e0c47798f73b9849bf9b5bef65ecbfb6d9fed48f6036418fd35dd6ba54e6c3f92e0174c8f5e93881a2e1f907242b40cea285e1ffe1e7c2b79769d
+  metadata.gz: 26b6cd39236411aa868b8feec61c480745f3a8aa5d11d20f2b4c9e63537a6377de8f6ad72132b1bac30e26a258367c6eeee37e27bf4d4ec0a7e1a5aec9d829f0
+  data.tar.gz: afdf91f95912d7afac4684fee66761f526a783174b3f78f6e3ad87625926093e7b0f104b221250c1fba026e44af0a0c487c32d4f50a3f5b25b3d4e3fa466f728

data/lib/glexchange.rb

@@ -509,13 +509,13 @@ private
 			end
 		end
 		
-		if submission.project.customAttributes != nil
+		if submission.project.customAttributes != nil && submission.project.customAttributes.length > 0
 			for projectCustomAttribute in submission.project.customAttributes
 				if projectCustomAttribute.mandatory
 					isSet = false
 					if submission.customAttributes !=nil
-						for submissionCustomAttribute in submission.customAttributes
-							if submissionCustomAttribute.name == projectCustomAttribute.name
+						for key in submission.customAttributes.keys
+							if key == projectCustomAttribute.name
 								isSet = true
 								break
 							end
@@ -526,6 +526,36 @@ private
 					end
 				end
 			end
+			if submission.customAttributes !=nil && submission.customAttributes.length > 0
+				for key in submission.customAttributes.keys
+					isExists = false
+					for projectCustomAttribute in submission.project.customAttributes
+						if key == projectCustomAttribute.name
+							isExists = true
+							if projectCustomAttribute.type=="COMBO" && projectCustomAttribute.values != nil
+								comboValueCorrect = false
+								va = projectCustomAttribute.values.split(',')
+								for option in va
+									if option == submission.customAttributes[key]
+										comboValueCorrect = true
+										break
+									end
+								end
+								if comboValueCorrect == false
+									raise "Value '#{submission.customAttributes[key]}' for custom field '#{key}' is not allowed. Allowed values:#{projectCustomAttribute.values}"
+								end
+							end
+						end
+					end
+					if isExists == false
+						raise "Custom field '#{key}' is not allowed in project"
+					end
+				end
+			end
+		else
+			if submission.customAttributes !=nil && submission.customAttributes.length > 0
+				raise "Project doesn't have custom attributes"
+	    	end
 		end
 	end
 	
@@ -562,7 +592,10 @@ private
 		@workflowService = addHeaders(Glexchange::Pdws::WorkflowServicePortType.new(@connectionConfig.url + "/services/WorkflowService_4180"))
 
 		begin
-			@projectService.getUserProjects(Glexchange::Pdws::GetUserProjects.new(true))
+			projects = @projectService.getUserProjects(Glexchange::Pdws::GetUserProjects.new(true))
+			if projects!=nil and projects.length==1 and projects[0]==nil
+				raise "Projects is nil"
+			end
 		rescue Exception
 			throw "Invalid config. " + $!.to_s
 		end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glexchange
 version: !ruby/object:Gem::Version
-  version: 4.18.1
+  version: 4.18.2
 platform: ruby
 authors:
 - translations.com