Changeset 730

Timestamp:

09/29/10 09:38:44 (14 years ago)

Author:

gaba

Message:

 

Location:

MDService2/trunk/MDService2/WebContent

Files:

• index.jsp (modified) (1 diff)
• scripts/mdservice2_ui.js (modified) (1 diff)

MDService2/trunk/MDService2/WebContent/index.jsp

@@ -43 +43 @@
 <h1>MDService2</h1>
 <div id="top-menu">
-User: <b><%= request.getRemoteUser() %></b><a href="workspace.jsp" >    login</a><br>
+<% if ( request.getRemoteUser() == null) {  %> 
+User:  ------          <a href="workspace.jsp" >    login</a><br>
+<% } else {  %> 
+User: <b><%= request.getRemoteUser() %></b><a href="logout.jsp" >    logout</a><br> 
+<% }%>
+
 <a href="static/profiles_stats.html" >Info from CompReg and DCR about Elements vs. DatCats</a> 
 </div>

MDService2/trunk/MDService2/WebContent/scripts/mdservice2_ui.js

@@ -984 +984 @@
 
 function saveWorkspace(){
-        
-        var tmp = JSON.stringify(jsonw["WorkspaceProfile"]);
-        /*
-        if (String(jsonw["WorkspaceProfile"]["Querysets"]) != "null") {
-                $.each(jsonw["WorkspaceProfile"]["Querysets"], function(i,item) {
-                        if (this.Queries != "null"){
-                            if (this.Queries[1] == undefined){
-                                var jj = this["Queries"][0];
-                                delete this["Queries"][0];
-                                this.Queries = {};
-                                this.Queries["Query"] = jj;
-                            }
-                            /*
-                            $.each(this.Queries,function(i,item){
-                                if (this.collections != "null"){
-                                         if (this.collections[1] == undefined){
-                                                        var jj = this["collections"][0];
-                                                        delete this["collections"][0];
-                                                        this.collections = {};
-                                                        this.collections["item"] = jj;
-                                                    }           
-                                }
-                            });
-                         //  /   
-                        }
-                });
-                if (jsonw["WorkspaceProfile"].Querysets[1] == undefined){
-                        
-                        var jj = jsonw["WorkspaceProfile"]["Querysets"][0];
-                        delete jsonw["WorkspaceProfile"]["Querysets"][0];
-                        jsonw["WorkspaceProfile"]["Querysets"] = {};
-                        jsonw["WorkspaceProfile"]["Querysets"]["Queryset"] = jj;
-                        
-                        
-                }
-                
-        }
-        */
+
         var JSONText = JSON.stringify(jsonw["WorkspaceProfile"]);
-        /*
-        if (jsonw["WorkspaceProfile"].Querysets[0] == undefined){
-                var jj = jsonw["WorkspaceProfile"]["Querysets"]["Queryset"];
-                delete jsonw["WorkspaceProfile"]["Querysets"]["Queryset"];
-                jsonw["WorkspaceProfile"]["Querysets"] = [{}];
-                jsonw["WorkspaceProfile"]["Querysets"][0] = jj;
-                }
-        if (String(jsonw["WorkspaceProfile"]["Querysets"]) != "null") {
-                
-                $.each(jsonw["WorkspaceProfile"]["Querysets"], function(i,item) {
-                    if (this.Queries[0] == undefined){
-                        var jj = this["Queries"]["Query"];
-                                delete this["Queries"]["Query"];
-                                this.Queries = [{}];
-                        this.Queries[0] = jj;
-                    }
-                });
-        }
-        */
-        //$.post("/MDService2/workspaceprofilesave/1/" + JSONText, "");
-        //var JSONText1 = "{WorkspaceProfile:{Querysets:{[{Query:}]}}}";
         $.post("/MDService2/workspaceprofilesave/1/" + JSONText, "");
 }