Indefero Commit Details

Date:

2008-11-23 04:12:16 (16 years 11 months ago)

Author:

Loic d'Anterroches

Branch:

dev, develop, feature-issue_links, feature.better-home, feature.content-md5, feature.diff-whitespace, feature.download-md5, feature.issue-links, feature.issue-of-others, feature.issue-summary, feature.search-filter, feature.webrepos, feature.wiki-default-page, master, release-1.1, release-1.2, release-1.3

Commit:

d9ffac099f77baed06bc1afc2e99969c062f89eb

Parents:

8eb5715656cfc94c312ee54e65b6c919c840489f

Message:

Added the visualisation of the old revisions of a page.

Changes:

File differences

-134
135 135
136 136
137
138
139
140
141
142
143
144
145
137 146
138 147
148
149
150
151
139 152
140 153
141 154
142 155
156
143 157
158
144 159
145 160
146 161
+            throw new Pluf_HTTP_Error404($request);␊
        }␊
        $page = $pages[0];␊
        $oldrev = false;␊
        // We grab the old revision if requested.␊
        if (isset($request->GET['rev']) and preg_match('/^[0-9]+$/', $request->GET['rev'])) {␊
            $oldrev = Pluf_Shortcuts_GetObjectOr404('IDF_WikiRevision',␊
                                                    $request->GET['rev']);␊
            if ($oldrev->wikipage != $page->id) {␊
                throw new Pluf_HTTP_Error404($request);␊
            }␊
        }␊
        $title = $page->title;␊
        $revision = $page->get_current_revision();␊
        $db = $page->getDbConnection();␊
        $false = Pluf_DB_BooleanToDb(false, $db);␊
        $revs = $page->get_revisions_list(array('order' => 'creation_dtime DESC',␊
                                                'filter' => 'is_head='.$false));␊
        return Pluf_Shortcuts_RenderToResponse('idf/wiki/view.html',␊
                                               array(␊
                                                     'page_title' => $title,␊
                                                     'page' => $page,␊
                                                     'oldrev' => $oldrev,␊
                                                     'rev' => $revision,␊
                                                     'revs' => $revs,␊
                                                     'tags' => $page->get_tags_list(),␊
                                                     ),␊
                                               $request);␊
             throw new Pluf_HTTP_Error404($request);␊
         }␊
         $page = $pages[0];␊
+        $oldrev = false;␊
+        // We grab the old revision if requested.␊
+        if (isset($request->GET['rev']) and preg_match('/^[0-9]+$/', $request->GET['rev'])) {␊
+            $oldrev = Pluf_Shortcuts_GetObjectOr404('IDF_WikiRevision',␊
+                                                    $request->GET['rev']);␊
+            if ($oldrev->wikipage != $page->id) {␊
+                throw new Pluf_HTTP_Error404($request);␊
+            }␊
+        }␊
         $title = $page->title;␊
         $revision = $page->get_current_revision();␊
+        $db = $page->getDbConnection();␊
+        $false = Pluf_DB_BooleanToDb(false, $db);␊
+        $revs = $page->get_revisions_list(array('order' => 'creation_dtime DESC',␊
+                                                'filter' => 'is_head='.$false));␊
         return Pluf_Shortcuts_RenderToResponse('idf/wiki/view.html',␊
                                                array(␊
                                                      'page_title' => $title,␊
                                                      'page' => $page,␊
+                                                     'oldrev' => $oldrev,␊
                                                      'rev' => $revision,␊
+                                                     'revs' => $revs,␊
                                                      'tags' => $page->get_tags_list(),␊
                                                      ),␊
                                                $request);␊

-56
57 57
58 58
59 
59
60 60
61 61
62 62
+</tr>{/if}␊
<tr>␊
<td>&nbsp;</td>␊
<td><input type="submit" value="{trans 'Preview'}" name="preview" /> &nbsp; <input type="submit" value="{trans 'Update Page'}" name="submit" /> | <a href="{url 'IDF_Views_Wiki::index', array($project.shortname)}">{trans 'Cancel'}</a>␊
<td><input type="submit" value="{trans 'Preview'}" name="preview" /> &nbsp; <input type="submit" value="{trans 'Update Page'}" name="submit" /> | <a href="{url 'IDF_Views_Wiki::view', array($project.shortname, $page.title)}">{trans 'Cancel'}</a>␊
</td>␊
</tr>␊
</table>␊
 </tr>{/if}␊
 <tr>␊
 <td>&nbsp;</td>␊
-<td><input type="submit" value="{trans 'Preview'}" name="preview" /> &nbsp; <input type="submit" value="{trans 'Update Page'}" name="submit" /> | <a href="{url 'IDF_Views_Wiki::index', array($project.shortname)}">{trans 'Cancel'}</a>␊
+<td><input type="submit" value="{trans 'Preview'}" name="preview" /> &nbsp; <input type="submit" value="{trans 'Update Page'}" name="submit" /> | <a href="{url 'IDF_Views_Wiki::view', array($project.shortname, $page.title)}">{trans 'Cancel'}</a>␊
 </td>␊
 </tr>␊
 </table>␊

-589
590 590
591 591
592
593
594
595
596
597
598
599
600
+  padding: 4px;␊
  width: 60%;␊
}␊
␊
div.old-rev { ␊
  padding: 1em 1em 0.1em 1em;␊
  margin-bottom: 1em;␊
  background-color: #bbe394;␊
  width: 40%;␊
  -moz-border-radius: 5px;␊
  -webkit-border-radius: 5px;␊
}␊
   padding: 4px;␊
   width: 60%;␊
 }␊
+␊
+div.old-rev { ␊
+  padding: 1em 1em 0.1em 1em;␊
+  margin-bottom: 1em;␊
+  background-color: #bbe394;␊
+  width: 40%;␊
+  -moz-border-radius: 5px;␊
+  -webkit-border-radius: 5px;␊
+}␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags