updated AMC to support 'write' role

Author: khaf

controllers/users.go

@@ -258,6 +258,9 @@ func privilegeFromString(s string) *as.Privilege {
 	case "read-write":
 		return &as.Privilege{Code: as.ReadWrite}
 
+	case "write":
+		return &as.Privilege{Code: as.Write}
+
 	case "read-write-udf":
 		return &as.Privilege{Code: as.ReadWriteUDF}
 	}

models/node.go

@@ -233,7 +233,11 @@ func (n *Node) RequestInfo(reties int, cmd ...string) (result map[string]string,
 	}
 
 	for i := 0; i < reties; i++ {
-		result, err = origNode.RequestInfo(cmd...)
+		client := n.cluster.origClient()
+		timeout := client.Cluster().ClientPolicy().Timeout
+
+		infoPolicy := &as.InfoPolicy{Timeout: timeout}
+		result, err = origNode.RequestInfo(infoPolicy, cmd...)
 		if err == nil {
 			return result, nil
 		}

static/js/models/configs/roleadminmodel.js

@@ -1,9 +1,10 @@
 define(["jquery", "underscore", "backbone", "helper/util", "config/app-config", "views/configs/roleadminview", "helper/AjaxManager"] , function($, _, Backbone, Util, AppConfig, RoleAdminView, AjaxManager) {
 	var UserModel = Backbone.Model.extend({
 		initialize : function(){
-			this.availablePrivileges = { UserAdmin : "user-admin", SystemAdmin : "sys-admin", ReadWrite : "read-write", Read : "read", ReadWriteUdf : "read-write-udf", DataAdmin : "data-admin"};
+			this.availablePrivileges = { UserAdmin : "user-admin", SystemAdmin : "sys-admin", ReadWrite : "read-write", Read : "read", ReadWriteUdf : "read-write-udf", DataAdmin : "data-admin", Write: "write"};
 			this.privilegeMap = {
                 'role-read': this.availablePrivileges.Read,
+                'role-write': this.availablePrivileges.Write,
                 'role-read-write': this.availablePrivileges.ReadWrite,
                 'role-user-admin': this.availablePrivileges.UserAdmin,
                 'role-sys-admin': this.availablePrivileges.SystemAdmin,

static/js/models/configs/useradminmodel.js

@@ -1,13 +1,14 @@
 define(["jquery", "underscore", "backbone", "helper/util", "config/app-config", "views/configs/useradminview", "helper/AjaxManager"] , function($, _, Backbone, Util, AppConfig, UserAdminView, AjaxManager) {
 	var UserModel = Backbone.Model.extend({
 		initialize : function(){
-			this.availableRoles = { UserAdmin : "user-admin", SystemAdmin : "sys-admin", ReadWrite : "read-write", Read : "read", ReadWriteUdf : "read-write-udf", DataAdmin : "data-admin"};
+			this.availableRoles = { UserAdmin : "user-admin", SystemAdmin : "sys-admin", ReadWrite : "read-write", Read : "read", ReadWriteUdf : "read-write-udf", DataAdmin : "data-admin", Write: "write"};
 			this.roleMap = {
                 'role-read': this.availableRoles.Read,
+                'role-write': this.availableRoles.Write,
                 'role-read-write': this.availableRoles.ReadWrite,
                 'role-user-admin': this.availableRoles.UserAdmin,
                 'role-system-admin': this.availableRoles.SystemAdmin,
-                'role-data-admin' : this.availableRoles.DataAdmin
+                'role-data-admin' : this.availableRoles.DataAdmin,
             };
 			this.view = new UserAdminView({model : this});
 			this.fetch();