[Fmsystem-commits] [9717]

[Torstein]

Revision: 9717
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9717
Author:   vator
Date:     2012-07-03 12:19:05 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/templates/base/case/create_case_message.xsl

Modified: trunk/controller/templates/base/case/create_case_message.xsl
===================================================================
--- trunk/controller/templates/base/case/create_case_message.xsl        
2012-07-03 12:18:53 UTC (rev 9716)
+++ trunk/controller/templates/base/case/create_case_message.xsl        
2012-07-03 12:19:05 UTC (rev 9717)
@@ -10,7 +10,14 @@
                                <h2><xsl:value-of 
select="component_array/xml_short_desc"/></h2>
                        </xsl:when>
                        <xsl:otherwise>
-                               <h2>Bygg: <xsl:value-of 
select="location_array/loc1_name"/></h2>
+                               <xsl:choose>
+                                       <xsl:when test="location_level = 1">
+                                               <h2>Eiendom: <xsl:value-of 
select="location_array/loc1_name"/></h2>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                                       <h2>Bygg: <xsl:value-of 
select="location_array/loc2_name"/></h2>
+                                       </xsl:otherwise>
+                               </xsl:choose>
                        </xsl:otherwise>
                </xsl:choose>
                
@@ -22,7 +29,7 @@
                        <xsl:choose>
                                <xsl:when 
test="check_items_and_cases/child::node()">
                                
-                               <form ENCTYPE="multipart/form-data" 
id="frmRegCaseMessage" 
action="index.php?menuaction=controller.uicase.register_case_message" 
method="post">
+                               <form ENCTYPE="multipart/form-data" 
id="frmRegCaseMessage" 
action="index.php?menuaction=controller.uicase.send_case_message" method="post">
                                        <input>
                                                <xsl:attribute 
name="name">check_list_id</xsl:attribute>
                                            <xsl:attribute 
name="type">hidden</xsl:attribute>
@@ -30,6 +37,20 @@
                                                <xsl:value-of 
select="check_list/id"/>
                                            </xsl:attribute>
                                        </input>
+                                               <input>
+                                               <xsl:attribute 
name="name">location_code</xsl:attribute>
+                                           <xsl:attribute 
name="type">hidden</xsl:attribute>
+                                           <xsl:attribute name="value">
+                                                       <xsl:choose>
+                                                         <xsl:when test="type 
= 'component'">
+                                                                 <xsl:value-of 
select="location_array/location_code"/>
+                                                               </xsl:when>
+                                                               <xsl:otherwise>
+                                                                 <xsl:value-of 
select="location_array/location_code"/>
+                                                               </xsl:otherwise>
+                                                       </xsl:choose>
+                                         </xsl:attribute>
+                                       </input>
                                        
                                        <!-- === TITLE === -->
                                    <div class="row">
@@ -37,28 +58,6 @@
                                                <input name="message_title" 
type="text" class="required" />
                                        </div>
                                                                        
-                                       <!-- ==================  BYGG  
===================== -->
-                                       <div class="row">
-                                               <xsl:choose>
-                                                       <xsl:when 
test="buildings_array/child::node()">
-                                                               
<label>Bygg:</label>
-                                                               <select 
id="building_id" name="building_id" class="required">
-                                                                               
<option value="0">
-                                                                               
        Velg bygning
-                                                                               
</option>
-                                                                               
<xsl:for-each select="buildings_array">
-                                                                               
        <option value="{id}">
-                                                                               
                <xsl:value-of disable-output-escaping="yes" select="name"/>
-                                                                               
        </option>
-                                                                               
</xsl:for-each>
-                                                                       
</select>
-                                                       </xsl:when>
-                                                       <xsl:otherwise>
-                                                               
<label>Bygg:</label> <xsl:value-of select="building/loc1_name"/>        
-                                                       </xsl:otherwise>
-                                               </xsl:choose>
-                                       </div>
-                                       
                                        <!-- === CATEGORY === -->
                                        <div class="row">
                                                <label>Kategori:</label>