Form filter enhancements, form config

Author: Nathan McMinn

pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/form/PDFActionFormFilter.java

@@ -13,9 +13,7 @@
 import org.alfresco.repo.forms.processor.action.ActionFormResult;
 import org.alfresco.repo.model.Repository;
 import org.alfresco.service.ServiceRegistry;
-import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
-import org.alfresco.service.cmr.repository.StoreRef;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

pdf-toolkit-share/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/pdftoolkit/components/form/controls/selectPage.ftl

@@ -21,7 +21,7 @@ scheme provided by the server
 			</select>
 		</div>
 
-		<input type="hidden" id="${fieldHtmlId}"/>
+		<input type="hidden" name="${field.name}" id="${fieldHtmlId}"/>
 </div>
 <script type="text/javascript">//<![CDATA[
 var SelectPage = new PDFToolkit.SelectPage("${fieldHtmlId}").setOptions(

pdf-toolkit-share/src/main/resources/META-INF/pdftoolkit/components/doclib/pdftoolkit-doclib-actions.js

@@ -77,6 +77,8 @@ PDFToolkit.Util = {};
 				this.pagesModule.hide();
 			}
 
+			this.setValue(null, this);
+			
 			YAHOO.util.Event.addListener([this.id + "-useScheme"], "click", this.toggleSchemes, this);
 		},
 
@@ -90,6 +92,7 @@ PDFToolkit.Util = {};
 						fn: function(response)
 						{
 							var pageSelect = YAHOO.util.Dom.get(this.id + "-pages");
+							YAHOO.util.Event.addListener(pageSelect, "change", this.setValue, this);
 							var pages = parseInt(response.json.pageCount);
 							if(pages > 0)
 							{
@@ -101,6 +104,7 @@ PDFToolkit.Util = {};
 									pageSelect.add(opt, null);
 								}
 							}
+							this.setValue(null, this);
 						},
 						scope: this
 					},
@@ -128,6 +132,8 @@ PDFToolkit.Util = {};
 						fn: function(response)
 						{
 							var schemeSelect = YAHOO.util.Dom.get(this.id + "-schemes");
+							YAHOO.util.Event.addListener(schemeSelect, "change", this.setValue, this);
+							
 							var schemes = response.json.schemes;
 							for(index in schemes)
 							{
@@ -136,6 +142,7 @@ PDFToolkit.Util = {};
 								opt.value = schemes[index].value;
 								schemeSelect.add(opt, null);
 							}
+							this.setValue(null, this);
 						},
 						scope: this
 					},
@@ -159,11 +166,36 @@ PDFToolkit.Util = {};
 			{
 				that.schemesModule.show();
 				that.pagesModule.hide();
+				that.setValue(event, that);
 			}
 			else
 			{
 				that.schemesModule.hide();
 				that.pagesModule.show();
+				that.setValue(event, that)
+			}
+		},
+		
+		setValue: function SelectPage_setValues(event, that)
+		{
+			var useScheme = YAHOO.util.Dom.get(that.id + "-useScheme").checked;
+			var schemeSelect = YAHOO.util.Dom.get(that.id + "-schemes");
+			var pageSelect = YAHOO.util.Dom.get(that.id + "-pages");
+			var hiddenValue = YAHOO.util.Dom.get(that.id);
+			
+			if(useScheme)
+			{
+				if(schemeSelect.selectedIndex != -1)
+				{
+					hiddenValue.value = schemeSelect.options[schemeSelect.selectedIndex].value;
+				}
+			}
+			else
+			{
+				if(pageSelect.selectedIndex != -1)
+				{
+					hiddenValue.value = pageSelect.options[pageSelect.selectedIndex].value;
+				}
 			}
 		}
 	});

pdf-toolkit-share/src/main/resources/META-INF/share-config-custom.xml

@@ -443,7 +443,7 @@
                     </field>
                     <field id="watermark-type">
                     	<control template="/org/alfresco/pdftoolkit/components/form/controls/dependentSelect.ftl">
-                    		<control-param name="showSelectValues">text:prop_watermark-text,prop_watermark-font,prop_watermark-size;image:assoc_watermark-image</control-param>
+                    		<control-param name="showSelectValues">text:prop_watermark-text,prop_watermark-font,prop_watermark-size;image:assoc_watermark-image-cntrl</control-param>
                     	</control>
                     </field>
                 </appearance>