Scarab commit: svn commit: r10612 - trunk/src: conf/classes conf/conf java/org/tigris/scarab/actions webapp/WEB-INF/templates/macros webapp/WEB-INF/templates/viewIssue

[email protected]
Newsgroups gmane.comp.java.scarab.cvs
Message-ID <[email protected]> 
Author: hair
Date: 2008-08-18 04:33:30-0700
New Revision: 10612

Modified:
   trunk/src/conf/classes/ScarabBundle_en.properties
   trunk/src/conf/conf/intake.xml
   trunk/src/java/org/tigris/scarab/actions/ModifyIssue.java
   trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm
   trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm

Log:
Issue SCB350:  (Non-integer values allowed in integer field)
 also fixed a bug where DateAttribute (once set) was never detected as unmodified preventing ModifyIssue.doSubmitAttributes from ever displaying the error: "Alert! You need to modify an attribute."


Modified: trunk/src/conf/classes/ScarabBundle_en.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_en.properties?view=diff&rev=10612&p1=trunk/src/conf/classes/ScarabBundle_en.properties&p2=trunk/src/conf/classes/ScarabBundle_en.properties&r1=10611&r2=10612
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_en.properties	(original)
+++ trunk/src/conf/classes/ScarabBundle_en.properties	2008-08-18 04:33:30-0700
@@ -1578,6 +1578,7 @@
 intake_EnterUrlStartingWithHttp=Please enter an url starting with "http"
 intake_ModuleRequiresValidUrl=This module requires a valid url.
 intake_InvalidIssueId=Please enter a valid issue ID or integer [1-999999999]
+intake_InvalidInteger=Please enter a valid integer [1-999999999]
 intake_InvalidFromDate=Invalid from date
 intake_InvalidToDate=Invalid to date
 intake_NameMayNotBeBlank=Name may not be blank

Modified: trunk/src/conf/conf/intake.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/conf/intake.xml?view=diff&rev=10612&p1=trunk/src/conf/conf/intake.xml&p2=trunk/src/conf/conf/intake.xml&r1=10611&r2=10612
==============================================================================
--- trunk/src/conf/conf/intake.xml	(original)
+++ trunk/src/conf/conf/intake.xml	2008-08-18 04:33:30-0700
@@ -265,7 +265,9 @@
         <field name="UserId" key="visid" type="int">
            <rule name="mask" value="[0-9]+">intake_BadIdMessage</rule>
         </field>
-        <field name="NumericValue" key="num" type="int" />
+        <field name="NumericValue" key="num" type="int">
+           <rule name="mask" value="[0-9]+">intake_InvalidInteger</rule>
+        </field>
         <field name="UserIds" key="visids" type="int" multiValued="true"/>
         <field name="Value" key="val" type="String">
            <rule name="mask" value="^$|\S">intake_ModuleRequiresDataForAttribute</rule>

Modified: trunk/src/java/org/tigris/scarab/actions/ModifyIssue.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/actions/ModifyIssue.java?view=diff&rev=10612&p1=trunk/src/java/org/tigris/scarab/actions/ModifyIssue.java&p2=trunk/src/java/org/tigris/scarab/actions/ModifyIssue.java&r1=10611&r2=10612
==============================================================================
--- trunk/src/java/org/tigris/scarab/actions/ModifyIssue.java	(original)
+++ trunk/src/java/org/tigris/scarab/actions/ModifyIssue.java	2008-08-18 04:33:30-0700
@@ -66,6 +66,7 @@
 import org.apache.turbine.tool.IntakeTool;
 import org.tigris.scarab.actions.base.BaseModifyIssue;
 import org.tigris.scarab.attribute.DateAttribute;
+import org.tigris.scarab.attribute.IntegerAttribute;
 import org.tigris.scarab.attribute.OptionAttribute;
 import org.tigris.scarab.attribute.UserAttribute;
 import org.tigris.scarab.notification.NotificationManagerFactory;
@@ -366,6 +367,20 @@
                     newValue = group.get("OptionId").toString();
                     oldValue = aval.getOptionIdAsString();
                 }
+                else if (aval instanceof DateAttribute)
+                {
+                    newValue = DateAttribute.internalDateFormat(
+                            group.get("Value").toString(),
+                            l10n.get(L10NKeySet.ShortDatePattern));
+                    oldValue = aval.getValue();
+                }
+                else if (aval instanceof IntegerAttribute)
+                {
+                    newValue = group.get("NumericValue").toString();
+                    oldValue = null != aval.getNumericValue() 
+                            ? aval.getNumericValue().toString()
+                            : "";
+                }
                 else 
                 {
                     newValue = group.get("Value").toString();

Modified: trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm?view=diff&rev=10612&p1=trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm&p2=trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm&r1=10611&r2=10612
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm	2008-08-18 04:33:30-0700
@@ -188,8 +188,7 @@
 #set ($attrInput = $intake.AttributeValue.mapTo($attrValue))
         #if ($attVal.Attribute.AttributeType.Name == "long-string")
            #textAreaMedium("$attrInput.Value.Key" $attrInput.Value)
-        #else
-            #if ($attVal.Attribute.AttributeType.Name == "date")
+        #elseif ($attVal.Attribute.AttributeType.Name == "date")
                 #if ($scarabG.getTurbineConfiguration().getString("scarab.datefields.editable") == "false")
                     #set ($readonly = "readonly")
                 #else
@@ -199,10 +198,10 @@
                 #set ($datevalue = $scarabR.formatDate($attrInput.Value.value))
                 <input type="text" id="$ref" name="$ref" $readonly value="$datevalue" size="20" />              
 <a id="dateAnchor$ref" name="dateAnchor$ref" href="javascript:;" onClick="calPopup.select(document.getElementById('$ref'),'dateAnchor$ref','$l10n.ShortDatePattern');return false;"><img src="$staticLink.setPath('/images/date.gif')" border="0"/></a>
-
-            #else
-               <input class="fullWidth" type="text" name="$attrInput.Value.Key" value="$!attrInput.Value"#if($size.length()) size="$size"#end />
-            #end
+        #elseif ($attVal.Attribute.AttributeType.Name == "integer")
+           <input class="fullWidth" type="text" name="$attrInput.NumericValue.Key" value="$!attrInput.NumericValue"#if($size.length()) size="$size"#end />
+        #else
+           <input class="fullWidth" type="text" name="$attrInput.Value.Key" value="$!attrInput.Value"#if($size.length()) size="$size"#end />
         #end
 #end
 

Modified: trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm?view=diff&rev=10612&p1=trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm&p2=trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm&r1=10611&r2=10612
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm	2008-08-18 04:33:30-0700
@@ -51,6 +51,9 @@
                     #if ($att.isOptionAttribute())

                       #attrValueLeafSelect ($attVal $field "" false $attVal.isRequired())

                       #attrValueErrorMsg ($attVal $field)

+                    #elseif ($att.isIntegerAttribute())

+                      #attrValueErrorMsg($attVal "NumericValue")

+                      #attrValueText($attrInput.NumericValue 70)

                     #else

                       #attrValueErrorMsg($attVal "Value")

                       #attrValueText($attrInput.Value 70)

@@ -87,13 +90,13 @@
                         ## Convert the raw text to formatted HTML before

                         ## displaying it.

                         $!scarabG.textToHTML($attrInput.Value.toString(), $link, $scarabR.CurrentModule)

+                      #elseif ($att.AttributeType.Name == "date")

+                        $scarabR.formatDate($!attrInput.Value.value)

+                      #elseif ($att.AttributeType.Name == "integer")

+                        $!attrInput.NumericValue.value

                       #else

-                        #if ($att.AttributeType.Name == "date")

-                          $scarabR.formatDate($!attrInput.Value.value)

-                        #else

-                          ## Just output the raw value directly.

-                          $!attrInput.Value

-                        #end

+                        ## Just output the raw value directly.

+                        $!attrInput.Value

                       #end

                     </td>

                   </tr>

@@ -104,7 +107,7 @@
               #set ($attVal = $allAttrValues.get($att.getName().toUpperCase()))

               #set ($attrInput = $intake.AttributeValue.mapTo($attVal))

               #set ($isOptionAttr = $attVal.Attribute.isOptionAttribute())

-              #if ($attVal.isSet() && !$attrInput.Value.toString().trim().equals(""))

+              #if ($attVal.isSet() && (!$attrInput.Value.toString().trim().equals("") || !$attrInput.NumericValue))

                 <tr>

               	  <th>[I] $rma.DisplayValue</th>

                   <td>

@@ -114,6 +117,8 @@
 			          #else

                        	[I]$!module.getRModuleOption($attVal.AttributeOption, $issueType).DisplayValue

 			          #end

+                    #elseif ($att.AttributeType.Name == "integer")

+                      $!attrInput.NumericValue.value

                     #else

                       $!attrInput.Value

                     #end
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.