Reset reject reason when approved

Fix display of reject reason when required

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@2535 a333f486-631f-4898-b8df-5754b55c2be0

datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml

@@ -301,7 +301,7 @@
                 <hidden/>
               </attribute>
               <attribute id="reason">
-                <hidden/>
+                <read_only/>
               </attribute>
               <attribute id="requestor_id">
                 <read_only/>
@@ -620,7 +620,8 @@
                 <hidden/>
               </attribute>
               <attribute id="reason">
-                <read_only/>
+                <mandatory/>
+		<must_prompt/>
               </attribute>
               <attribute id="requestor_id">
                 <read_only/>
@@ -872,6 +873,16 @@
 		return true;
 	}]]></code>
         </method>
+        <method id="ResetRejectReason">
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[	public function ResetRejectReason($sStimulusCode)
+	{
+		$this->Set('reason', '');
+		return true;
+	}]]></code>
+        </method>
         <method id="OnInsert">
           <static>false</static>
           <access>protected</access>
@@ -1238,7 +1249,7 @@
           </attributes>
         </naming>
         <display_template/>
-        <icon>../modules/itop-change-mgmt-itil/images/change.png</icon>
+        <icon>images/change.png</icon>
         <reconciliation>
           <attributes>
             <attribute id="ref"/>
@@ -1294,7 +1305,7 @@
                 <hidden/>
               </attribute>
               <attribute id="reason">
-                <mandatory/>
+                <hidden/>
               </attribute>
               <attribute id="requestor_id">
                 <mandatory/>
@@ -1578,7 +1589,8 @@
                 <hidden/>
               </attribute>
               <attribute id="reason">
-                <read_only/>
+                <mandatory/>
+		<must_prompt/>
               </attribute>
               <attribute id="requestor_id">
                 <read_only/>
@@ -2096,7 +2108,7 @@
           </attributes>
         </naming>
         <display_template/>
-        <icon>../modules/itop-change-mgmt-itil/images/change.png</icon>
+        <icon>images/change.png</icon>
         <reconciliation>
           <attributes>
             <attribute id="ref"/>
@@ -2163,7 +2175,7 @@
                 <hidden/>
               </attribute>
               <attribute id="reason">
-                <mandatory/>
+                <hidden/>
               </attribute>
               <attribute id="requestor_id">
                 <mandatory/>
@@ -2297,6 +2309,7 @@
               </attribute>
               <attribute id="reason">
                 <mandatory/>
+		<must_prompt/>
               </attribute>
               <attribute id="requestor_id">
                 <mandatory/>
@@ -3090,7 +3103,7 @@
           </attributes>
         </naming>
         <display_template/>
-        <icon>../modules/itop-change-mgmt-itil/images/change.png</icon>
+        <icon>images/change.png</icon>
         <reconciliation>
           <attributes>
             <attribute id="ref"/>
@@ -3152,7 +3165,7 @@
                 <hidden/>
               </attribute>
               <attribute id="reason">
-                <mandatory/>
+                <hidden/>
               </attribute>
               <attribute id="requestor_id">
                 <mandatory/>
@@ -3198,7 +3211,11 @@
               <transition>
                 <stimulus>ev_validate</stimulus>
                 <target>validated</target>
-                <actions/>
+                <actions>
+                  <action>
+                    <verb>ResetRejectReason</verb>
+                  </action>
+                </actions>
               </transition>
               <transition>
                 <stimulus>ev_reject</stimulus>
@@ -3315,6 +3332,7 @@
               </attribute>
               <attribute id="reason">
                 <mandatory/>
+		<must_prompt/>
               </attribute>
               <attribute id="requestor_id">
                 <mandatory/>
@@ -3519,7 +3537,11 @@
               <transition>
                 <stimulus>ev_approve</stimulus>
                 <target>approved</target>
-                <actions/>
+                <actions>
+                  <action>
+                    <verb>ResetRejectReason</verb>
+                  </action>
+                </actions>
               </transition>
               <transition>
                 <stimulus>ev_notapprove</stimulus>
@@ -3638,7 +3660,8 @@
                 <hidden/>
               </attribute>
               <attribute id="reason">
-                <read_only/>
+                <mandatory/>
+		<must_prompt/>
               </attribute>
               <attribute id="requestor_id">
                 <read_only/>
@@ -4219,7 +4242,7 @@
           </attributes>
         </naming>
         <display_template/>
-        <icon>../modules/itop-change-mgmt-itil/images/change.png</icon>
+        <icon>images/change.png</icon>
         <reconciliation>
           <attributes>
             <attribute id="ref"/>
@@ -4275,7 +4298,7 @@
                 <hidden/>
               </attribute>
               <attribute id="reason">
-                <mandatory/>
+                <hidden/>
               </attribute>
               <attribute id="requestor_id">
                 <mandatory/>
@@ -4475,7 +4498,11 @@
               <transition>
                 <stimulus>ev_approve</stimulus>
                 <target>approved</target>
-                <actions/>
+                <actions>
+                  <action>
+                    <verb>ResetRejectReason</verb>
+                  </action>
+                </actions>
               </transition>
               <transition>
                 <stimulus>ev_notapprove</stimulus>
@@ -4594,7 +4621,8 @@
                 <hidden/>
               </attribute>
               <attribute id="reason">
-                <read_only/>
+                <mandatory/>
+		<must_prompt/>
               </attribute>
               <attribute id="requestor_id">
                 <read_only/>

datamodels/2.x/itop-change-mgmt-itil/en.dict.itop-change-mgmt-itil.php

@@ -88,7 +88,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:Change/Attribute:status/Value:monitored+' => '',
 	'Class:Change/Attribute:status/Value:closed' => 'Closed',
 	'Class:Change/Attribute:status/Value:closed+' => '',
-	'Class:Change/Attribute:reason' => 'Reason',
+	'Class:Change/Attribute:reason' => 'Reject reason',
 	'Class:Change/Attribute:reason+' => '',
 	'Class:Change/Attribute:requestor_id' => 'Requestor',
 	'Class:Change/Attribute:requestor_id+' => '',

datamodels/2.x/itop-change-mgmt-itil/fr.dict.itop-change-mgmt-itil.php

@@ -50,7 +50,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Change/Attribute:status/Value:monitored+' => '',
 	'Class:Change/Attribute:status/Value:closed' => 'Fermé',
 	'Class:Change/Attribute:status/Value:closed+' => '',
-	'Class:Change/Attribute:reason' => 'Raison',
+	'Class:Change/Attribute:reason' => 'Raison du rejet',
 	'Class:Change/Attribute:reason+' => '',
 	'Class:Change/Attribute:requestor_id' => 'Demandeur',
 	'Class:Change/Attribute:requestor_id+' => '',