소스 검색

fix subject

a.binder 6 년 전
부모
커밋
5eea247a1a

+ 30 - 6
SE/schema/WPS_Functions/send_email/send_email.xsl

@@ -27,14 +27,26 @@
     </xsl:template>
     
     <xsl:template mode="send_email:send_email_from_xml_parsed.child" match="title">
-        <send_email:send_email.send_email_from_xml_parsed.xml.child.title><xsl:copy-of select="*/text()"/></send_email:send_email.send_email_from_xml_parsed.xml.child.title>
+        <send_email:send_email.send_email_from_xml_parsed.xml.child.title>
+            <xsl:for-each select="*">
+                <xsl:text> </xsl:text><xsl:copy-of select="text()"/><xsl:text> </xsl:text>
+                <xsl:for-each select="*">
+                    <xsl:text> </xsl:text><xsl:copy-of select="text()"/><xsl:text> </xsl:text>
+                </xsl:for-each>
+            </xsl:for-each>
+            
+        </send_email:send_email.send_email_from_xml_parsed.xml.child.title>
     </xsl:template>
     
     <xsl:template mode="send_email:send_email_from_xml_parsed.child" match="text()">
+        <xsl:variable name="REPLYTO" select="parent::node()/@REPLYTO"/>
         <xsl:for-each select="tokenize(.,' ')">
             <xsl:choose>
                 <xsl:when test="contains(.,'@')">
-                    <send_email:send_email.send_email_from_xml_parsed.xml.child><xsl:value-of select="."/></send_email:send_email.send_email_from_xml_parsed.xml.child>
+                    <send_email:send_email.send_email_from_xml_parsed.xml.child>
+                        <xsl:copy-of select="$REPLYTO"/>
+                        <xsl:value-of select="."/>
+                    </send_email:send_email.send_email_from_xml_parsed.xml.child>
                 </xsl:when>
                 <xsl:otherwise>
                     
@@ -74,15 +86,21 @@
             <target name="send_email.send_email_from_xml_parsed.build.xml.confirm.all">
                 <exec executable="mutt">
                     <xsl:attribute name="inputstring">${send_email.send_email_from_xml_parsed.build.xml.title}</xsl:attribute>
+                    <xsl:if test="send_email:send_email.send_email_from_xml_parsed.xml.child[@REPLYTO]">
+                        <env key="REPLYTO" value="{send_email:send_email.send_email_from_xml_parsed.xml.child[@REPLYTO][1]/text()}"/>
+                    </xsl:if>
                     <arg line='-a "{$out.pdf}"'/>
-                    <arg line='-s "Wiadomosc"'/>
+                    <!--<arg line='-s "Wiadomosc"'/>-->
+                    <arg>
+                        <xsl:attribute name="line">-s &quot;${send_email.send_email_from_xml_parsed.build.xml.title}&quot;</xsl:attribute>
+                    </arg>
                     <arg line='-e "set copy = no"'/>
                     <arg line='-F /dev/null'/>
                     <arg>
                         <xsl:attribute name="line"><xsl:text>-- </xsl:text>
-                            <xsl:for-each select="send_email:send_email.send_email_from_xml_parsed.xml.child">
+                            <xsl:for-each-group select="send_email:send_email.send_email_from_xml_parsed.xml.child" group-by="text()">
                                 <xsl:value-of select="text()"/><xsl:text> </xsl:text>
-                            </xsl:for-each>
+                            </xsl:for-each-group>
                         </xsl:attribute>
                     </arg>
                 </exec>
@@ -98,8 +116,14 @@
                         </mail>-->
                         <exec executable="mutt">
                             <xsl:attribute name="inputstring">${send_email.send_email_from_xml_parsed.build.xml.title}</xsl:attribute>
+                            <xsl:if test="send_email:send_email.send_email_from_xml_parsed.xml.child[@REPLYTO]">
+                                <env key="REPLYTO" value="{send_email:send_email.send_email_from_xml_parsed.xml.child[@REPLYTO][1]/text()}"/>
+                            </xsl:if>
                             <arg line='-a "{$out.pdf}"'/>
-                            <arg line='-s "Wiadomosc"'/>
+                            <!--<arg line='-s "Wiadomosc"'/>-->
+                            <arg>
+                                <xsl:attribute name="line">-s &quot;${send_email.send_email_from_xml_parsed.build.xml.title}&quot;</xsl:attribute>
+                            </arg>
                             <arg line='-F /dev/null'/>
                             <!--<arg line='&lt; /dev/null'/>-->
                             <arg line='-e "set copy = no"'/>

+ 1 - 1
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/pismo/IN7_DZIENNIK_KORESP.dita

@@ -75,7 +75,7 @@
     
     <foreign>
       <RelatedFeature xpath="ADM_ACCOUNT" xpath_value="../L_APPOITMENT_USER" typeName="p5_default_db:ADMIN_USERS" typeNameRealResource="p5_default_db:ADMIN_USERS">
-        <ph xpath="EMAIL_LOCAL_ACCOUNT_ADDRESS" xpath_token_filter=" " xpath_token="1"/>
+        <ph xpath="EMAIL_LOCAL_ACCOUNT_ADDRESS" xpath_token_filter=" " xpath_token="1" REPLYTO="1"/>
       </RelatedFeature>
       <RelatedFeature xpath="ADM_ACCOUNT" xpath_value="../A_RECORD_UPDATE_AUTHOR" typeName="p5_default_db:ADMIN_USERS" typeNameRealResource="p5_default_db:ADMIN_USERS">
         <ph xpath="EMAIL_LOCAL_ACCOUNT_ADDRESS" xpath_token_filter=" " xpath_token="1"/>