diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-04-25 15:06:20 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-04-25 15:06:20 +0000 |
| commit | 52547466f0f1ce8b41bf1539546aaa28457077a1 (patch) | |
| tree | b2ffc5296536fb77afd07bc2a96ad934af5a79a6 /app/views/wiki | |
| parent | 4967fa8733e220e2220fdd546df3b46ef5725ac9 (diff) | |
| download | redmine-52547466f0f1ce8b41bf1539546aaa28457077a1.tar.gz redmine-52547466f0f1ce8b41bf1539546aaa28457077a1.zip | |
Fixed: 10342 Creation of Schema in Oracle
Comment is a reserved keyword for Oracle. The five 'Comment' columns are renamed to 'Commments'.
Migration scripts were modified to let oracle users create the database. For the others, migration 41 will rename the columns (only if columns have the 'old' name).
Fixed also a few oracle specific issues.
Note: currently (in Rails 1.2.3), there's bug in Rails oracle adapter. See: http://dev.rubyonrails.org/ticket/7344
Attached patch is required for redMine to work properly.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@479 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/wiki')
| -rw-r--r-- | app/views/wiki/edit.rhtml | 2 | ||||
| -rw-r--r-- | app/views/wiki/history.rhtml | 4 | ||||
| -rw-r--r-- | app/views/wiki/show.rhtml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/views/wiki/edit.rhtml b/app/views/wiki/edit.rhtml index 0bc6322f9..af0b24df0 100644 --- a/app/views/wiki/edit.rhtml +++ b/app/views/wiki/edit.rhtml @@ -12,7 +12,7 @@ :onclick => "window.open('#{ url_for :controller => 'help', :ctrl => 'wiki', :page => 'syntax' }', '', 'resizable=yes, location=no, width=300, height=500, menubar=no, status=no, scrollbars=yes'); return false;" %> </div> <p><%= f.text_area :text, :cols => 100, :rows => 25, :class => 'wiki-edit' %></p> -<p><label><%= l(:field_comment) %></label><br /><%= f.text_field :comment, :size => 120 %></p> +<p><label><%= l(:field_comments) %></label><br /><%= f.text_field :comments, :size => 120 %></p> <p><%= submit_tag l(:button_save) %> <%= link_to_remote l(:label_preview), { :url => { :controller => 'wiki', :action => 'preview', :id => @project, :page => @page.title }, diff --git a/app/views/wiki/history.rhtml b/app/views/wiki/history.rhtml index dd9e590be..78dc70cc5 100644 --- a/app/views/wiki/history.rhtml +++ b/app/views/wiki/history.rhtml @@ -11,7 +11,7 @@ <th>#</th> <th><%= l(:field_updated_on) %></th> <th><%= l(:field_author) %></th> - <th><%= l(:field_comment) %></th> + <th><%= l(:field_comments) %></th> </tr></thead> <tbody> <% @versions.each do |ver| %> @@ -19,7 +19,7 @@ <th align="center"><%= link_to ver.version, :action => 'index', :page => @page.title, :version => ver.version %></th> <td align="center"><%= format_time(ver.updated_on) %></td> <td><em><%= ver.author ? ver.author.name : "anonyme" %></em></td> - <td><%=h ver.comment %></td> + <td><%=h ver.comments %></td> </tr> <% end %> </tbody> diff --git a/app/views/wiki/show.rhtml b/app/views/wiki/show.rhtml index e4e1bc38d..a65b1a61e 100644 --- a/app/views/wiki/show.rhtml +++ b/app/views/wiki/show.rhtml @@ -13,7 +13,7 @@ <%= link_to(l(:label_current_version), :action => 'index', :page => @page.title) %> <br /> <em><%= @content.author ? @content.author.name : "anonyme" %>, <%= format_time(@content.updated_on) %> </em><br /> - <%=h @content.comment %> + <%=h @content.comments %> </p> <hr /> <% end %> |