Fixing a couple bugs for alexey

admc · Aug 29, 2009 · 4edfdce · 4edfdce
1 parent 340a266
commit 4edfdce
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 34 deletions.
diff --git a/projects/templates/base.html b/projects/templates/base.html
@@ -39,7 +39,7 @@
     <script src="/static/js/jquery-ui-1.7.2.custom/js/jquery.jqGrid.js" type="text/javascript"></script>
 
     <script type="text/javascript">
-      
+    	
       var callResizeGrid = function(){
         if (window.onresize){
           window.onresize();
@@ -121,34 +121,15 @@ <h1>
     <div class="ui-layout-center" id="layout-center">
       {% block content %}{% endblock %}
     </div>
-
-  <script type="text/javascript" charset="utf-8">
-    //     $.post("/projects/list", { },   function(data){ 
-    //   var blah = eval(data);
-    // 
-    //   if (blah.length == 0){
-    //     $('#layout-west')[0].innerHTML = "No Projects..";
-    //   } else {
-    //     $('#layout-west')[0].innerHTML = "";
-    //   }
-    //   
-    //   for (var i=0;i<blah.length;i++){
-    //     $('#layout-west')[0].innerHTML += "<a href='/projects/doc/"+blah[i].id+"'>"+ blah[i].value.name + "</a>";
-    //   }
-    // });
-
-
-    $(document).ready(function(){
-  		$("#black").treeview({
-  			url: "/projects/tree",
-				animated: "fast",
-    		collapsed: true,
-    		unique: true,
-    		persist: "cookie",
-    		control: "#treecontrol",
-  		})
-
-  	});
-  </script>
+    <script type="text/javascript" charset="utf-8">
+    		$("#black").treeview({
+    			url: "/projects/tree",
+  				animated: "fast",
+      		collapsed: true,
+      		unique: true,
+      		persist: "cookie",
+      		control: "#treecontrol",
+    		})
+    </script>
 </body>
 </html>
diff --git a/projects/templates/projects/detail.html b/projects/templates/projects/detail.html
@@ -133,6 +133,17 @@ <h1>{{ row.name }}</h1>
 
 
 <script type="text/javascript" charset="utf-8">
+  var replaceAll = function (OldString, FindString, ReplaceString) {
+    var SearchIndex = 0;
+    var NewString = ""; 
+    while (OldString.indexOf(FindString,SearchIndex) != -1)    {
+      NewString += OldString.substring(SearchIndex,OldString.indexOf(FindString,SearchIndex));
+      NewString += ReplaceString;
+      SearchIndex = (OldString.indexOf(FindString,SearchIndex) + FindString.length);         
+    }
+    NewString += OldString.substring(SearchIndex,OldString.length);
+    return NewString;
+  }
 
   var viewDocs = function(){
      var sRow = jQuery('#casesGrid').getGridParam('selrow');
@@ -170,11 +181,23 @@ <h1>{{ row.name }}</h1>
        var olComments = $('#sourceTabs-1').find(".c");
 
        for (var ml=0;ml<mlComments.length; ml++){
-         $('#sourceTabs-2')[0].innerHTML += mlComments[ml].innerHTML + "<br>";
+         var newInner = mlComments[ml].innerHTML.toLowerCase();
+         newInner = replaceAll(newInner, " ", "");
+
+         if ((newInner.indexOf("#step") != -1) || (newInner.indexOf("testid") != -1)){
+          $('#sourceTabs-2')[0].innerHTML += mlComments[ml].innerHTML + "<br>";
+        }
        }
 
+       $('#sourceTabs-2')[0].innerHTML += "<br>";
+
        for (var ol=0;ol<olComments.length;ol++){
-         $('#sourceTabs-2')[0].innerHTML += olComments[ol].innerHTML + "<br>";
+         var newInner = olComments[ol].innerHTML.toLowerCase();
+         newInner = replaceAll(newInner, " ", "");
+
+         if ((newInner.indexOf("#step") != -1) || (newInner.indexOf("testid") != -1)){
+           $('#sourceTabs-2')[0].innerHTML += olComments[ol].innerHTML + "<br>";
+         }
        }
 
  	   });

diff --git a/projects/views.py b/projects/views.py
@@ -110,15 +110,15 @@ def build_app_dict(app_name):
     #return the dictionary
     return p_dict
 
-#Ajax call to build the tree view in the UI of apps
+
 @login_required
 def tree(request):
 
     apps_lists = []  
     #build a display for each application
     for app in Application.objects.all():
         apps_lists.append(build_app_dict(app.name))
-    
+
     json = simplejson.dumps(apps_lists)
     return HttpResponse(json)