Indefero Commit Details

Date:

2009-01-02 06:58:55 (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:

60bc06f5c3aa33163ad2ebf2691692dc07108f86

Parents:

a36e89ac2edb097c7e3e900da808e0a3e76fd812

Message:

Added ticket 90, propose to create a new documentation page when it doesn't exists.

Changes:

File differences

-54
55 55
56 56
57
57 58
58 59
59 60
60 
61
61 62
62 63
63 64
+            or $this->user->hasPerm('IDF.project-member', $this->project)) {␊
            $this->show_full = true;␊
        }␊
        $initname = (!empty($extra['name'])) ? $extra['name'] : __('PageName');␊
        $this->fields['title'] = new Pluf_Form_Field_Varchar(␊
                                      array('required' => true,␊
                                            'label' => __('Page title'),␊
                                            'initial' => __('PageName'),␊
                                            'initial' => $initname,␊
                                            'widget_attrs' => array(␊
                                                       'maxlength' => 200,␊
                                                       'size' => 67,␊
             or $this->user->hasPerm('IDF.project-member', $this->project)) {␊
             $this->show_full = true;␊
         }␊
+        $initname = (!empty($extra['name'])) ? $extra['name'] : __('PageName');␊
         $this->fields['title'] = new Pluf_Form_Field_Varchar(␊
                                       array('required' => true,␊
                                             'label' => __('Page title'),␊
-                                            'initial' => __('PageName'),␊
+                                            'initial' => $initname,␊
                                             'widget_attrs' => array(␊
                                                        'maxlength' => 200,␊
                                                        'size' => 67,␊

-53
54 54
55 55
56 
56
57 57
58 58
59
60
61
62
59 63
60 64
61 65
+        $sql = new Pluf_SQL('project=%s AND title=%s', ␊
                            array($this->project->id, $m[1]));␊
        $pages = Pluf::factory('IDF_WikiPage')->getList(array('filter'=>$sql->gen()));␊
        if ($pages->count() != 1) {␊
        if ($pages->count() != 1 and !$this->request->rights['hasWikiAccess']) {␊
            return $m[0];␊
        }␊
        if ($pages->count() != 1 and $this->request->rights['hasWikiAccess']␊
            and !$this->request->user->isAnonymous()) {␊
            return '<img style="vertical-align: text-bottom;" alt=" " src="'.Pluf::f('url_media').'/idf/img/add.png" /><a href="'.Pluf_HTTP_URL_urlForView('IDF_Views_Wiki::create', array($this->project->shortname), array('name'=>$m[1])).'" title="'.__('Create this documentation page').'">'.$m[1].'</a>';␊
        }␊
        if (!$this->request->rights['hasWikiAccess']) {␊
            return $m[1];␊
        }␊
         $sql = new Pluf_SQL('project=%s AND title=%s', ␊
                             array($this->project->id, $m[1]));␊
         $pages = Pluf::factory('IDF_WikiPage')->getList(array('filter'=>$sql->gen()));␊
-        if ($pages->count() != 1) {␊
+        if ($pages->count() != 1 and !$this->request->rights['hasWikiAccess']) {␊
             return $m[0];␊
         }␊
+        if ($pages->count() != 1 and $this->request->rights['hasWikiAccess']␊
+            and !$this->request->user->isAnonymous()) {␊
+            return '<img style="vertical-align: text-bottom;" alt=" " src="'.Pluf::f('url_media').'/idf/img/add.png" /><a href="'.Pluf_HTTP_URL_urlForView('IDF_Views_Wiki::create', array($this->project->shortname), array('name'=>$m[1])).'" title="'.__('Create this documentation page').'">'.$m[1].'</a>';␊
+        }␊
         if (!$this->request->rights['hasWikiAccess']) {␊
             return $m[1];␊
         }␊

-90
91 91
92 92
93 
93
94 94
95 95
96 96
... ...
98 98
99 99
100 100
101
102
103
101 104
102 105
103 106
+                                     );␊
␊
    public $allowed = array(␊
                            'img' => array('src', 'class', 'alt', 'height', 'width'),␊
                            'img' => array('src', 'class', 'alt', 'height', 'width', 'style'),␊
                            'strong' => array(),␊
                            'em' => array(),␊
                            'b' => array(),␊

                            'ul' => array(),␊
                            'ol' => array(),␊
                            'li' => array(),␊
                            'dl' => array(),␊
                            'dt' => array(),␊
                            'dd' => array(),␊
                            'p' => array('align', 'class'),␊
                            'div' => array('align', 'class'),␊
                            'br' => array(),␊
 ...
                                      );␊
 ␊
     public $allowed = array(␊
-                            'img' => array('src', 'class', 'alt', 'height', 'width'),␊
+                            'img' => array('src', 'class', 'alt', 'height', 'width', 'style'),␊
                             'strong' => array(),␊
                             'em' => array(),␊
                             'b' => array(),␊
                             'ul' => array(),␊
                             'ol' => array(),␊
                             'li' => array(),␊
+                            'dl' => array(),␊
+                            'dt' => array(),␊
+                            'dd' => array(),␊
                             'p' => array('align', 'class'),␊
                             'div' => array('align', 'class'),␊
                             'br' => array(),␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags