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/timelog | |
| 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/timelog')
| -rw-r--r-- | app/views/timelog/details.rhtml | 4 | ||||
| -rw-r--r-- | app/views/timelog/edit.rhtml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/timelog/details.rhtml b/app/views/timelog/details.rhtml index f85eb0f5a..4ceca97be 100644 --- a/app/views/timelog/details.rhtml +++ b/app/views/timelog/details.rhtml @@ -16,7 +16,7 @@ <%= sort_header_tag('user_id', :caption => l(:label_member)) %>
<%= sort_header_tag('activity_id', :caption => l(:label_activity)) %>
<%= sort_header_tag('issue_id', :caption => l(:label_issue)) %>
-<th><%= l(:label_comment) %></th>
+<th><%= l(:label_comments) %></th>
<%= sort_header_tag('hours', :caption => l(:field_hours)) %>
<th></th>
</thead>
@@ -36,7 +36,7 @@ </div>
<% end %>
</td>
-<td><%=h entry.comment %></td>
+<td><%=h entry.comments %></td>
<td align="center"><strong><%= entry.hours %></strong></td>
<td align="center"><%= link_to_if_authorized(l(:button_edit), {:controller => 'timelog', :action => 'edit', :id => entry}, :class => "icon icon-edit") if entry.user_id == @owner_id %></td>
</tr>
diff --git a/app/views/timelog/edit.rhtml b/app/views/timelog/edit.rhtml index b826f7be7..13d76f1ef 100644 --- a/app/views/timelog/edit.rhtml +++ b/app/views/timelog/edit.rhtml @@ -7,7 +7,7 @@ <p><%= f.text_field :issue_id, :size => 6 %> <em><%= h("#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}") if @time_entry.issue %></em></p>
<p><%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p>
<p><%= f.text_field :hours, :size => 6, :required => true %></p>
-<p><%= f.text_field :comment, :size => 100 %></p>
+<p><%= f.text_field :comments, :size => 100 %></p>
<p><%= f.select :activity_id, (@activities.collect {|p| [p.name, p.id]}), :required => true %></p>
</div>
|