Merge branch 'finn-master' of https://dev.finn.de/git/redmine-backlogs into finn-master

app/controllers/rb_application_controller.rb

@@ -16,8 +16,6 @@ class RbApplicationController < ApplicationController
                  @sprint.project
                elsif params[:project_id]
                  Project.find(params[:project_id])
-               else
-                 raise "Cannot determine project (#{params.inspect})"
                end
   end
 

app/helpers/rb_master_backlogs_helper.rb

@@ -22,67 +22,64 @@ module RbMasterBacklogsHelper
     items = common_backlog_menu_items_for(backlog)
 
     if backlog.sprint_backlog?
-      items += sprint_backlog_menu_items_for(backlog)
-    else
-      items += owner_backlog_menu_items_for(backlog)
+      items.merge!(sprint_backlog_menu_items_for(backlog))
     end
 
-    items
+    menu = []
+    [:new_story, :stories_tasks, :task_board, :cards, :wiki].each do |key|
+      menu << items[key] if items.keys.include?(key)
+    end
+
+    menu
   end
 
   def common_backlog_menu_items_for(backlog)
-    items = []
+    items = {}
 
-    items << content_tag(:a, l('backlogs.add_new_story'), :href => '#', :class => 'add_new_story')
+    items[:new_story] = content_tag(:a,
+                                    l('backlogs.add_new_story'),
+                                    :href => '#',
+                                    :class => 'add_new_story')
 
-    items << link_to(l(:label_stories_tasks),
-                     :controller => 'rb_queries',
-                     :action => 'show',
-                     :project_id => @project,
-                     :sprint_id => backlog.sprint)
+    items[:stories_tasks] = link_to(l(:label_stories_tasks),
+                                    :controller => 'rb_queries',
+                                    :action => 'show',
+                                    :project_id => @project,
+                                    :sprint_id => backlog.sprint)
+
+    if Cards::TaskboardCards.selected_label.present?
+      items[:cards] = link_to(l(:label_sprint_cards),
+                              :controller => 'rb_stories',
+                              :action => 'index',
+                              :project_id => @project,
+                              :sprint_id => backlog.sprint,
+                              :format => :pdf)
+    end
+
+    items
   end
 
   def sprint_backlog_menu_items_for(backlog)
-    items = []
+    items = {}
 
-    items << link_to(l(:label_task_board),
-                     :controller => 'rb_taskboards',
-                     :action => 'show',
-                     :sprint_id => backlog.sprint)
+    items[:task_board] = link_to(l(:label_task_board),
+                                 :controller => 'rb_taskboards',
+                                 :action => 'show',
+                                 :sprint_id => backlog.sprint)
 
     if backlog.sprint_backlog? and backlog.sprint.has_burndown
-      items << content_tag(:a, l('backlogs.show_burndown_chart'), :href => '#', :class => 'show_burndown_chart')
-    end
-
-    if Cards::TaskboardCards.selected_label.present?
-      items << link_to(l(:label_sprint_cards),
-                       :controller => 'rb_stories',
-                       :action => 'index',
-                       :project_id => @project,
-                       :sprint_id => backlog.sprint,
-                       :format => :pdf)
+      items[:burndown] = content_tag(:a,
+                                     l('backlogs.show_burndown_chart'),
+                                     :href => '#',
+                                     :class => 'show_burndown_chart')
     end
 
     if @project.module_enabled? "wiki"
-      items << link_to(l(:label_wiki),
-                       :controller => 'rb_wikis',
-                       :action => 'edit',
-                       :project_id => @project.id,
-                       :sprint_id => backlog.sprint)
-    end
-
-    items
-  end
-
-  def owner_backlog_menu_items_for(backlog)
-    items = []
-
-    if Cards::TaskboardCards.selected_label.present?
-      items << link_to(l(:label_product_cards),
-                       :controller => 'rb_stories',
-                       :action => 'index',
-                       :project_id => @project,
-                       :format => :pdf)
+      items[:wiki] = link_to(l(:label_wiki),
+                             :controller => 'rb_wikis',
+                             :action => 'edit',
+                             :project_id => @project.id,
+                             :sprint_id => backlog.sprint)
     end
 
     items

app/views/shared/_view_issues_sidebar.html.erb

@@ -11,23 +11,6 @@
         <% end %>
     <% end %>
 
-    <% if project.present? %>
-      <h3><%= project.name %></h3>
-      <%= link_to(l(:backlogs_product_backlog), {
-              :controller => 'rb_queries',
-              :action => 'show',
-              :project_id => project.id
-              }) %><br/>
-      <% if Cards::TaskboardCards.selected_label %>
-        <%= link_to(l(:label_product_cards), {
-                :controller => 'rb_stories',
-                :action => 'index',
-                :project_id => project.id,
-                :format => 'pdf'
-                }) %><br/>
-      <% end %>
-    <% end %>
-
     <% if Setting.rest_api_enabled? && key %>
       <a href="<%= url_for({
                     :only_path  => false,

config/locales/de.yml

@@ -7,7 +7,7 @@ de:
   field_remaining_hours: Verbleibende Stunden
   error_intro_singular: "Der folgende Fehler ist aufgetreten:"
   button_edit_wiki: Wiki Seite bearbeiten
-  label_sprint_cards: "Sprint-Karten"
+  label_sprint_cards: Karten exportieren
   label_points_burn_up: Hoch
   label_not_prioritized: nicht priorisiert
   points_resolved: Beschlossene Punkte
@@ -74,7 +74,6 @@ de:
     %{summary}: %{url}
     %{description}
   label_burndown: Burndown
-  label_product_cards: "Produkt Backlog Karten"
   rb_label_copy_tasks_all: "Alle"
   field_velocity_based_estimate: "Geschwindigkeitsbasierende Absch\xC3\xA4tzung"
   todo_issue_description: |-
@@ -100,4 +99,12 @@ de:
 
   field_blocks_ids: Blockiert (IDs)
   error_can_only_contain_issues_of_current_sprint: kann nur IDs von Tickets des aktuellen Sprints enthalten
-  error_must_block_at_least_one_issue: muss die ID wenigstens eines Tickets enthalten
+  error_must_block_at_least_one_issue: muss die ID wenigstens eines Tickets enthalten
+
+  activerecord:
+    errors:
+      models:
+        issue:
+          attributes:
+            parent_issue_id:
+              tracker_must_be_one_of_the_following: "muss aus einem der folgenden Trackern sein: %{tracker_names}"

config/locales/en-GB.yml

@@ -9,7 +9,7 @@ en-GB:
   button_edit_wiki: Edit wiki page
   label_points_burn_up: Up
   label_not_prioritized: not prioritized
-  label_sprint_cards: Sprint cards
+  label_sprint_cards: Export Cards
   points_resolved: points resolved
   field_name: Name
   field_tracker_id: Tracker ID
@@ -76,7 +76,6 @@ en-GB:
   label_burndown: Burndown
   rb_label_copy_tasks_all: "[[All]]"
   field_velocity_based_estimate: Velocity based estimate
-  label_product_cards: Product backlog cards
   todo_issue_description: |-
     %{summary}: %{url}
     %{description}

config/locales/en.yml

@@ -34,8 +34,7 @@ en:
   label_stories_tasks: "Stories/Tasks"
   label_stories: "Stories"
   label_burndown: "Burndown"
-  label_product_cards: "Product backlog cards"
-  label_sprint_cards: "Sprint cards"
+  label_sprint_cards: Export cards
   label_select_all: "Select all"
 
   label_back_to_project: "Back to project page"

config/locales/fr.yml

@@ -1,5 +1,5 @@
---- 
-fr: 
+---
+fr:
   rb_label_copy_tasks_open: "[[Open]]"
   label_webcal: Fil Calendrier Web
   event_sprint_summary: "%{project}: %{summary}"
@@ -76,7 +76,6 @@ fr:
   label_burndown: Progression
   rb_label_copy_tasks_all: "[[All]]"
   field_velocity_based_estimate: "Estimé basé sur la vélocité"
-  label_product_cards: Cartes de carnet du produit
   todo_issue_description: |-
     %{summary}: %{url}
     %{description}

config/locales/nl.yml

@@ -1,5 +1,5 @@
---- 
-nl: 
+---
+nl:
   rb_label_copy_tasks_open: "Open"
   event_sprint_summary: "%{project}: %{summary}"
   label_webcal: Agenda
@@ -80,7 +80,6 @@ nl:
     %{description}
   label_chart_options: Grafiek Opties
   field_velocity_based_estimate: Schatting obv velocity
-  label_product_cards: Product backlog kaarten
   backlogs_product_backlog: Product backlog
   remaining_hours: resterende uren
   error_outro: Verbeter a.u.b de eerdergenoemde problemen voordat u nogmaals verzend.

config/locales/pt-BR.yml

@@ -1,5 +1,5 @@
---- 
-pt-BR: 
+---
+pt-BR:
   label_webcal: "[[Webcal Feed]]"
   rb_label_copy_tasks_open: "[[Open]]"
   event_sprint_summary: "%{project}: %{summary}"
@@ -76,7 +76,6 @@ pt-BR:
     %{summary}: %{url}
     %{description}
   label_burndown: Burndown
-  label_product_cards: "[[Product backlog cards]]"
   rb_label_copy_tasks_all: "[[All]]"
   field_velocity_based_estimate: Velocidade estimada
   todo_issue_description: |-

config/locales/zh.yml

@@ -1,5 +1,5 @@
---- 
-zh: 
+---
+zh:
   label_webcal: "[[Webcal Feed]]"
   rb_label_copy_tasks_open: "[[Open]]"
   event_sprint_summary: "%{project}: %{summary}"
@@ -196,7 +196,6 @@ zh:
   label_burndown: !binary |
     54eD5bC9
 
-  label_product_cards: "[[Product backlog cards]]"
   rb_label_copy_tasks_all: "[[All]]"
   field_velocity_based_estimate: !binary |
     6YCf5bqm6K6h6YeP5Y2V5L2N

features/scrum_master.feature

@@ -233,7 +233,7 @@ Feature: Scrum Master
       And I am on the issues index page
       And I follow "Sprint 001"
      Then the request should complete successfully
-     When I follow "Sprint cards"
+     When I follow "Export cards"
      Then the request should complete successfully
 
   Scenario: view the sprint notes