You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2013/01/29 21:56:25 UTC
svn commit: r1440124 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root: js/ducc.js preferences.jsp

Author: degenaro
Date: Tue Jan 29 20:56:25 2013
New Revision: 1440124

URL: http://svn.apache.org/viewvc?rev=1440124&view=rev
Log:
UIMA-2616 Webserver Preferences -> Reset button should switch Role from Administrator to User

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/preferences.jsp

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js?rev=1440124&r1=1440123&r2=1440124&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js Tue Jan 29 20:56:25 2013
@@ -2201,6 +2201,10 @@ function ducc_preferences_reset()
 		var value = "include";
 		//alert("ducc_preferences_reset"+" "+"key:"+key+" "+"value:"+value);
 		ducc_put_cookie(key,value);
+		var key = ducc_appl("role");
+		var value = "user";
+		//alert("ducc_preferences_reset"+" "+"key:"+key+" "+"value:"+value);
+		ducc_put_cookie(key,value);
 		//
 		ducc_preferences();
 	}
@@ -2342,19 +2346,19 @@ function ducc_preferences_role() {
 		var key = ducc_appl("role");
 		var value = ducc_get_cookie(key);
 		//alert("ducc_preferences"+" "+"key:"+key+" "+"value:"+value);
-		if(value == "administrator") {
+		if(value == "user") {
 			document.form_preferences.role[0].checked = true;
 			document.form_preferences.role[1].checked = false;
 		}
-		else if(value == "user") {
+		else if(value == "administrator") {
 			document.form_preferences.role[0].checked = false;
 			document.form_preferences.role[1].checked = true;
 		}
 		else {
 			value = "user";
 			ducc_put_cookie(key, value);
-			document.form_preferences.role[0].checked = false;
 			document.form_preferences.role[1].checked = true;
+			document.form_preferences.role[0].checked = false;
 		}
 	}
 	catch(err) {

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/preferences.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/preferences.jsp?rev=1440124&r1=1440123&r2=1440124&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/preferences.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/preferences.jsp Tue Jan 29 20:56:25 2013
@@ -157,9 +157,9 @@ if (role) {
 		<tr>
         <td><i><b>Role</b></i>
 		<td>&nbsp
-		<td><input type="radio"  name="role" value="administrator"         onclick="ducc_preferences_set('role','administrator')" /> Administrator
-		<td>&nbsp
 		<td><input type="radio"  name="role" value="user"          checked onclick="ducc_preferences_set('role','user')" /> User
+		<td>&nbsp
+		<td><input type="radio"  name="role" value="administrator"         onclick="ducc_preferences_set('role','administrator')" /> Administrator
 <%
 }
 %>