Merge branch 'master' of http://github.com/joaojose/scrum-pm

bureku · May 4, 2010 · 151583b · 151583b
2 parents 28383f3 + 8f1d259
commit 151583b
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 2 deletions.
diff --git a/app/controllers/sprints_controller.rb b/app/controllers/sprints_controller.rb
@@ -28,7 +28,7 @@ def index
   def show
     unless @sprint.nil?
       @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 ])
+             :conditions => ["issue_statuses.is_closed = ? AND user_story_id IS NULL AND (fixed_version_id = ? OR project_id = ?)", false, @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/models/sprint_issue.rb b/app/models/sprint_issue.rb
@@ -1,4 +1,5 @@
 class SprintIssue < Issue
+  unloadable
   belongs_to :user_story, :class_name => 'UserStory', :foreign_key => 'user_story_id'
 
   def validate

diff --git a/app/views/user_stories/_us_for_show.html.erb b/app/views/user_stories/_us_for_show.html.erb
@@ -9,7 +9,7 @@
       <%= image_tag("/plugin_assets/redmine_sprints/images/us-top.png") %>
     <table>
       <tr >
-        <td><div class="tab_sprint_user_story">#<%= user_story.id %></div></td>
+        <td><div class="tab_sprint_user_story">#<%= user_story.us_number %></div></td>
         <td class="tab_us_name"><%=h user_story.name %></td>
         <td class="tab_us_links">
           <!--This will be done at some point-->

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
@@ -0,0 +1,49 @@
+pt-BR:
+  label_dashboard: Dashboard
+  label_backlog: Backlog
+  backlog: Backlog
+  new_user_story: Nova estória
+  add_user_stories_are_assign: Todas as estórias estão alocadas
+  user_story: Estória
+  priority: Prioridade
+  ID: ID
+  estimation: Estimativa
+  actions: Ações
+  new_sprint: Novo sprint
+  days: Dias
+  ends_on: Termina em
+  points: Pontos
+  edit: Editar
+  delete: Excluir
+  sprint_edit: Editar sprint
+  status: Status
+  id: ID
+  sprints: Sprints
+  done: Finalizado
+  pending: Pendente
+  in_progress: Em progresso
+  drag_user_story_here_to_assign_it_to_sprint: Arraste as estórias aqui para atribuir ao sprint.
+  drag_user_story_here_to_assign_it_to_milestone: Arraste as estórias aqui para atribuir ao milestone.
+  sprint_description: Descrição do sprint
+  new_task: Nova tarefa
+  destroy: Excluir
+  new: Novo
+  show: Exibir
+  choose: Escolher
+  add: Adicionar
+  create: Criar
+
+  user_story_edit: Editar estória
+  name: Nome
+  description: Descrição
+  update: Atualizar
+  add_task: Adicionar tarefa
+  stats: Estatísticas
+  total_story_points: Pontuação total das estórias
+  percent_done: Percentual finalizado
+  you_have_to_create_sprint_first: Você precisa criar o sprint primeiro.
+  upload_a_diagram: Upload de um diagrama
+  new_diagram: Novo diagrama
+  unassigned_issues: Tarefas não atribuídas
+  error_changing_status: Erro ao alterar status. talvez você não tenha permissão.
+  error_while_adding_sprint: Erro ao adicionar Sprint. Campo Data é requerido.
diff --git a/lib/software_project/redmine/current_version_extension.rb b/lib/software_project/redmine/current_version_extension.rb
@@ -3,6 +3,7 @@ module Redmine
     module VersionExtension
       def self.included(base)
         base.class_eval do
+          unloadable
           has_many :user_stories, :class_name => 'UserStory', :foreign_key => 'version_id'
         end
       end
@@ -11,6 +12,7 @@ def self.included(base)
     module IssueExtension
       def self.included(base)
         base.class_eval do
+          unloadable
           belongs_to :user_story, :class_name => 'UserStory', :foreign_key => 'user_story_id'
         end
       end