view_wiki_history.diff

Jon Evans, 2008-05-01 16:23

Download (5.24 KB)

View differences:

test/fixtures/roles.yml (working copy)
28 28
    - :view_documents
29 29
    - :manage_documents
30 30
    - :view_wiki_pages
31
    - :view_wiki_history
31 32
    - :edit_wiki_pages
32 33
    - :delete_wiki_pages
33 34
    - :rename_wiki_pages
......
68 69
    - :view_documents
69 70
    - :manage_documents
70 71
    - :view_wiki_pages
72
    - :view_wiki_history
71 73
    - :edit_wiki_pages
72 74
    - :delete_wiki_pages
73 75
    - :add_messages
......
103 105
    - :view_documents
104 106
    - :manage_documents
105 107
    - :view_wiki_pages
108
    - :view_wiki_history
106 109
    - :edit_wiki_pages
107 110
    - :delete_wiki_pages
108 111
    - :add_messages
......
133 136
    - :view_documents
134 137
    - :manage_documents
135 138
    - :view_wiki_pages
139
    - :view_wiki_history
136 140
    - :edit_wiki_pages
137 141
    - :add_messages
138 142
    - :view_files
......
153 157
    - :view_time_entries
154 158
    - :view_documents
155 159
    - :view_wiki_pages
160
    - :view_wiki_history
156 161
    - :view_files
157 162
    - :browse_repository
158 163
    - :view_changesets
app/views/wiki/show.rhtml (working copy)
3 3
<%= link_to_if_authorized(l(:button_rename), {:action => 'rename', :page => @page.title}, :class => 'icon icon-move') if @content.version == @page.content.version %>
4 4
<%= link_to_if_authorized(l(:button_delete), {:action => 'destroy', :page => @page.title}, :method => :post, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') %>
5 5
<%= link_to_if_authorized(l(:button_rollback), {:action => 'edit', :page => @page.title, :version => @content.version }, :class => 'icon icon-cancel') if @content.version < @page.content.version %>
6
<%= link_to(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %>
6
<%= link_to_if_authorized(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %>
7 7
</div>
8 8

  
9 9
<% if @content.version != @page.content.version %>
lib/redmine/default_data/loader.rb (working copy)
61 61
                                                      :comment_news,
62 62
                                                      :view_documents,
63 63
                                                      :view_wiki_pages,
64
                                                      :view_wiki_history,
64 65
                                                      :edit_wiki_pages,
65 66
                                                      :delete_wiki_pages,
66 67
                                                      :add_messages,
......
81 82
                                                    :comment_news,
82 83
                                                    :view_documents,
83 84
                                                    :view_wiki_pages,
85
                                                    :view_wiki_history,
84 86
                                                    :add_messages,
85 87
                                                    :view_files,
86 88
                                                    :browse_repository,
......
95 97
                                                            :comment_news,
96 98
                                                            :view_documents,
97 99
                                                            :view_wiki_pages,
100
                                                            :view_wiki_history,
98 101
                                                            :add_messages,
99 102
                                                            :view_files,
100 103
                                                            :browse_repository,
......
105 108
                                                           :view_time_entries,
106 109
                                                           :view_documents,
107 110
                                                           :view_wiki_pages,
111
                                                           :view_wiki_history,
108 112
                                                           :view_files,
109 113
                                                           :browse_repository,
110 114
                                                           :view_changesets]
lib/redmine.rb (working copy)
74 74
    map.permission :manage_wiki, {:wikis => [:edit, :destroy]}, :require => :member
75 75
    map.permission :rename_wiki_pages, {:wiki => :rename}, :require => :member
76 76
    map.permission :delete_wiki_pages, {:wiki => :destroy}, :require => :member
77
    map.permission :view_wiki_pages, :wiki => [:index, :history, :diff, :annotate, :special]
77
    map.permission :view_wiki_pages, :wiki => [:index, :special]
78
    map.permission :view_wiki_history, :wiki => [:history, :diff, :annotate]
78 79
    map.permission :edit_wiki_pages, :wiki => [:edit, :preview, :add_attachment, :destroy_attachment]
79 80
  end
80 81