Changeset 1136 for MDService2/trunk

Timestamp:

02/17/11 22:54:18 (13 years ago)

Author:

gaba

Message:

 

Location:

MDService2/trunk/MDService2/WebContent

Files:

• scripts/mdservice_ui.js (modified) (2 diffs)
• scripts/mdservice_ui_helpers.js (modified) (1 diff)
• scripts/mdservice_ui_load.js (modified) (1 diff)
• style/cmds-ui.css (modified) (2 diffs)

MDService2/trunk/MDService2/WebContent/scripts/mdservice_ui.js

@@ -95 +95 @@
                 
                 var q = new Query(collections, columns, query, squery); //actions.collections.current, query );
-                q.repository = 1;//getSelectedRepository();
+                q.repository = getSelectedRepository();
                 if (ws) {
                         q.options = "withSummary";
@@ -648 +648 @@
 function addToNotifylist (x) {  
         $("#notifylist").prepend(x);    
-}
-
-function getSelectedRepository(){
-        //var id = parseInt($('#repositories_select').find("option:selected").val());
-        return 1;//$('#repositories_select').find("option:selected").val();
-
 }
 

MDService2/trunk/MDService2/WebContent/scripts/mdservice_ui_helpers.js

@@ -148 +148 @@
 }
 
+function loadQuery(q){
+        if (q["bookmark"] == "1") {
+                var uri = "/MDService2/record/htmldetail/" + q["querystring"];
+                showDetail(null,'html');
+                $.get(uri, showDetail,'html');
+        } else {
+                //hideWelcomeMessage();
+                var query = new Query([],"","","");
+                query.load(q);
+                query.repository = getSelectedRepository();
+                queryset.addquery(query);
+                
+                searchclauseset.sctext = query.query;
+                notifyUser(searchclauseset.sctext,'debug');
+                searchclauseset.buildfromquerystring();
+
+                collections = query.collection;
+                collections_widget.load(query.collection);
+                columns_widget.load(query.columns.split(','));
+                $('#input-simplequery').attr("value",query.squery);
+                $('#input-withsummary').attr("checked",(query.options != null));
+        } 
+
+}
+
 function link(action,format,params) {
         var l = actions[action].base_uri + format;

MDService2/trunk/MDService2/WebContent/scripts/mdservice_ui_load.js

@@ -175 +175 @@
         $select.change(function(data){
                 loadCollections(false);                         
-                //loadTerms();
-                handleQueryInput();
+                loadTerms();
+                loadTermsAutocomplete();
                 $('#model_profiles').load(link('terms','htmlselect',actions.terms.current) + '?repository=' + getSelectedRepository());
         });

MDService2/trunk/MDService2/WebContent/style/cmds-ui.css

@@ -68 +68 @@
 .ui-widget-content { padding: 6px;      } 
 
-.cmds-ui-block { margin: 2px; text-align: left;}
+.cmds-ui-block { margin: 2px; text-align: left; overflow: auto;}
 
 .cmds-elem-plus .detail,
@@ -211 +211 @@
                 border:                 0; /* cosmetic */
                 padding:                0; 
-                overflow:               hidden;
+                /*overflow:             hidden;*/
         }