fixed issues 19 to 26

bureku · Apr 20, 2010 · 74ea3ac · 74ea3ac
1 parent 331fbf3
commit 74ea3ac
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/app/controllers/issue_sprints_controller.rb b/app/controllers/issue_sprints_controller.rb
@@ -94,7 +94,6 @@ def status_change
         end
         issue.status = issue_status(issue)
         issue.user_story_id = params[:user_story_id]
-        issue.author = User.current
       end
 
       if issue.save                                     

diff --git a/app/controllers/sprints_controller.rb b/app/controllers/sprints_controller.rb
@@ -27,8 +27,8 @@ def index
   # GET /sprints/1.xml
   def show
     unless @sprint.nil?
-      @unassigned_tasks = Issue.find(:all,
-             :conditions => ["user_story_id IS NULL AND (fixed_version_id = ? OR project_id = ?)", @sprint.id, @project.id ])
+      @unassigned_tasks = Issue.find(:all, :joins => :status,
+             :conditions => ["issue_statuses.is_closed = 0 AND user_story_id IS NULL AND (fixed_version_id = ? OR project_id = ?)", @sprint.id, @project.id ])
       @issue_statuses = IssueStatus.find(:all)
       @project_users = User.find(:all, :joins => :members, :conditions => ["members.project_id = ?", @project.id])
 

diff --git a/app/views/shared/_task_view.html.erb b/app/views/shared/_task_view.html.erb
@@ -3,7 +3,9 @@
 <div class="<%= "the_task_#{task.status_id}" %>" >
 <table>
   <tr>
-    <td class="task_center" colspan="2"><%= task.subject %></td>
+    <td class="task_center" colspan="2">
+      <%= link_to task.subject, :controller => "issues", :action => "show", :id => task.id %>
+    </td>
   </tr>
   <tr>
     <td colspan="2">

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -48,3 +48,4 @@ en:
   unassigned_issues: Unassigned issues
   error_changing_status: Error while changing status. You may not have persmissions.
   error_while_adding_sprint: Error while adding Sprint. Field Date is required.
+  field_user_story: Field User Story
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
@@ -46,4 +46,5 @@ pl:
   new_diagram: Nowy diagram
   unassigned_issues: Nieprzypisane zadania
   error_changing_status: Błąd podczas zmiany statusu. Możesz nie mieć prawa do tej zmiany.
-  error_while_adding_sprint: Błąd podczas dodawania Sprintu. Pole data jest wymagane.
+  error_while_adding_sprint: Błąd podczas dodawania Sprintu. Pole data jest wymagane.
+  field_user_story: Pole Historia Użytkownika