diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-05-20 17:46:02 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-05-20 17:46:02 +0000 |
| commit | d34ea9a56986a524382641de987f818bbd0131e4 (patch) | |
| tree | c9a09706ca3ac5e3b650faed3192c7418bd2a348 /app/views/projects | |
| parent | bb1fccb7b7202ec065fdc39646067054580d278f (diff) | |
| download | redmine-d34ea9a56986a524382641de987f818bbd0131e4.tar.gz redmine-d34ea9a56986a524382641de987f818bbd0131e4.zip | |
Versions can now be created with no date.
Versions with no date appear at the end of the roadmap, sorted by name.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@536 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/changelog.rhtml | 31 | ||||
| -rw-r--r-- | app/views/projects/roadmap.rhtml | 2 | ||||
| -rw-r--r-- | app/views/projects/settings.rhtml | 2 |
3 files changed, 22 insertions, 13 deletions
diff --git a/app/views/projects/changelog.rhtml b/app/views/projects/changelog.rhtml index f42f32c42..c76159471 100644 --- a/app/views/projects/changelog.rhtml +++ b/app/views/projects/changelog.rhtml @@ -11,17 +11,26 @@ <% end %> </div> -<% if @fixed_issues.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %> +<% if @versions.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %> -<% ver_id = nil - @fixed_issues.each do |issue| %> - <% unless ver_id == issue.fixed_version_id %> - <% if ver_id %></ul><% end %> - <h3 class="icon22 icon22-package"><%= issue.fixed_version.name %></h3> - <p><%= format_date(issue.fixed_version.effective_date) %><br /> - <%=h issue.fixed_version.description %></p> +<% @versions.each do |version| %> + <a name="<%= version.name %>"><h3 class="icon22 icon22-package"><%= version.name %></h3></a> + <% if version.completed? %> + <p><%= format_date(version.effective_date) %></p> + <% elsif version.effective_date %> + <p><strong><%=l(:label_roadmap_due_in)%> <%= distance_of_time_in_words Time.now, version.effective_date %> (<%= format_date(version.effective_date) %>)</strong></p> + <% end %> + <p><%=h version.description %></p> + <% issues = version.fixed_issues.find(:all, + :include => [:status, :tracker], + :conditions => ["#{IssueStatus.table_name}.is_closed=? AND #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')})", true], + :order => "#{Tracker.table_name}.position") + %> + <% if !issues.empty? %> <ul> - <% ver_id = issue.fixed_version_id - end %> - <li><%= link_to_issue issue %>: <%=h issue.subject %></li> + <% issues.each do |issue| %> + <li><%= link_to_issue(issue) %>: <%=h issue.subject %></li> + <% end %> + </ul> + <% end %> <% end %> diff --git a/app/views/projects/roadmap.rhtml b/app/views/projects/roadmap.rhtml index ab591a830..81ea703c6 100644 --- a/app/views/projects/roadmap.rhtml +++ b/app/views/projects/roadmap.rhtml @@ -18,7 +18,7 @@ <a name="<%= version.name %>"><h3 class="icon22 icon22-package"><%= version.name %></h3></a> <% if version.completed? %> <p><%= format_date(version.effective_date) %></p> - <% else %> + <% elsif version.effective_date %> <p><strong><%=l(:label_roadmap_due_in)%> <%= distance_of_time_in_words Time.now, version.effective_date %> (<%= format_date(version.effective_date) %>)</strong></p> <% end %> <p><%=h version.description %></p> diff --git a/app/views/projects/settings.rhtml b/app/views/projects/settings.rhtml index 81150dd54..bd73076cc 100644 --- a/app/views/projects/settings.rhtml +++ b/app/views/projects/settings.rhtml @@ -27,7 +27,7 @@ <table class="list"> <thead><th><%= l(:label_version) %></th><th><%= l(:field_effective_date) %></th><th><%= l(:field_description) %></th><th style="width:15%"></th><th style="width:15%"></th></thead> <tbody> -<% for version in @project.versions %> +<% for version in @project.versions.sort %> <tr class="<%= cycle 'odd', 'even' %>"> <td><%=h version.name %></td> <td align="center"><%= format_date(version.effective_date) %></td> |