Changeset 25721 for main/trunk

Timestamp:

2012-05-31T12:58:12+12:00 (12 years ago)

Author:

kjdon

Message:

the delete user javascript is repeated several times in the page, and each redefinition of the variables seemd to be overriding the previous ones. So for each click on delete, you would get the same message about deleting the last user. The click would actually delete the right one, but the message was wrong. So I have added position info to the var names, eg username1, username2 etc so they don't affect each other

File:

• main/trunk/greenstone3/web/interfaces/default/transform/pages/authen.xsl (modified) (3 diffs)

main/trunk/greenstone3/web/interfaces/default/transform/pages/authen.xsl

@@ -78 +78 @@
                         </tr>
                         <xsl:for-each select="/page/pageResponse/authenticationNode/service/userNodeList/userNode">
+          
                             <tr class="ui-widget-content">
                                 <td><xsl:value-of select="@username"/></td>
@@ -95 +96 @@
                                 <td><a href="{$library_name}/admin/EditUser?s1.username={@username}"><button><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.edit')"/></button></a></td>
                                 <td>
-                                    <form method="GET" action="{$library_name}/admin/PerformDeleteUser">
+                                <xsl:variable name="user-pos">username<xsl:number value="position()"/></xsl:variable>
+                                                        <xsl:variable name="message-pos">confirmMessage<xsl:number value="position()"/></xsl:variable> 
+          <form method="GET" action="{$library_name}/admin/PerformDeleteUser">
                                         <input type="hidden" name="s1.username" value="{@username}"/>
                                         <input id="delUser{@username}" type="submit" value="{util:getInterfaceText($interface_name, /page/@lang, 'authen.delete')}"/>
@@ -101 +104 @@
                                             <xsl:text disable-output-escaping="yes">
                                             {
-                                                var username = "</xsl:text><xsl:value-of select="@username"/><xsl:text disable-output-escaping="yes">";
-                                                var confirmMessage = "</xsl:text><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.delete_warning')"/><xsl:text disable-output-escaping="yes">";
-                                                var button = $("#delUser" + username);
+                                                var </xsl:text><xsl:value-of select="$user-pos"/><xsl:text disable-output-escaping="yes"> = "</xsl:text><xsl:value-of select="@username"/><xsl:text disable-output-escaping="yes">";
+                                                var </xsl:text><xsl:value-of select="$message-pos"/><xsl:text disable-output-escaping="yes"> = "</xsl:text><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.delete_warning')"/><xsl:text disable-output-escaping="yes">" + </xsl:text><xsl:value-of select="$user-pos"/><xsl:text disable-output-escaping="yes"> + "?";
+                                                var button = $("#delUser" + </xsl:text><xsl:value-of select="$user-pos"/><xsl:text disable-output-escaping="yes">);
                                                 button.click(function()
                                                 {
-                                                    if(confirm(confirmMessage + username + "?"))
+                                                    if(confirm(</xsl:text><xsl:value-of select="$message-pos"/><xsl:text disable-output-escaping="yes">))
                                                     {
                                                         return true;