Changeset 739 for trunk

Timestamp:

02/17/11 06:58:12 (15 months ago)

Author:

mgalloy

Message:

Fix for ticket #72. Now directories have a separate system_overview_comments which is a clone of overview_comments, but links are filled at the system level instead of the directory level.

Location:

trunk/src

Files:

• templates/overview.tt (modified) (1 diff)
• tree/doctreedirectory__define.pro (modified) (4 diffs)

trunk/src/templates/overview.tt

@@ -49 +49 @@
         <tr>
           <td class="name"><a href="[% url %]dir-overview.html">[% location %]</a></td>
-          <td>[% overview_comments %]</td>
+          <td>[% system_overview_comments %]</td>
         </tr>
         [% END %][% END %]

trunk/src/tree/doctreedirectory__define.pro

@@ -118 +118 @@
           return, self.system->processComments(self.overviewComments)
         endif
-
-        if (obj_valid(self.comments)) then begin
-          return, self.system->processComments(self.comments)
-        endif
         
         return, ''
       end
-      
+    'system_overview_comments': begin
+        if (obj_valid(self.systemOverviewComments)) then begin
+          return, self.system->processComments(self.systemOverviewComments)
+        endif
+        
+        return, ''
+      end      
     'has_comments': return, obj_valid(self.comments) || obj_valid(self.overviewComments)
     'comments': begin
@@ -370 +372 @@
   
   doctree_fill_links, self.comments, self  
+  
+  self.systemOverviewComments = self.overviewComments->_clone()
   doctree_fill_links, self.overviewComments, self
-  
+  doctree_fill_links, self.systemOverviewComments, self.system
+ 
   proFiles = self.proFiles->get(/all, count=nproFiles)
   for i = 0L, nproFiles - 1L do (proFiles[i])->fillLinks
@@ -445 +450 @@
   compile_opt strictarr, hidden
   
-  obj_destroy, [self.overviewComments, self.comments]
+  obj_destroy, [self.overviewComments, self.systemOverviewComments, self.comments]
   obj_destroy, [self.author, self.copyright, self.history]
   obj_destroy, [self.proFiles, self.dlmFiles, self.savFiles, self.idldocFiles]
@@ -556 +561 @@
                           
              overviewComments: obj_new(), $
+             systemOverviewComments: obj_new(), $
              comments: obj_new(), $