Permalink
Browse files

Release openproject-ce v5.0.9

  • Loading branch information...
2 parents 7d2f56c + 940de8a commit 9de29aab5927f378b183676a92071699940406ad @oliverguenther oliverguenther committed Jan 13, 2016
Showing with 15,465 additions and 273 deletions.
  1. +1 −1 Gemfile
  2. +55 −55 Gemfile.lock
  3. +1 −1 Gemfile.plugins
  4. +1 −1 app/helpers/sort_helper.rb
  5. +19 −8 app/helpers/toolbar_helper.rb
  6. +3 −3 app/models/project/storage.rb
  7. +1 −1 app/views/activities/index.html.erb
  8. +1 −1 app/views/auth_sources/edit.html.erb
  9. +1 −1 app/views/auth_sources/new.html.erb
  10. +1 −1 app/views/categories/destroy.html.erb
  11. +3 −4 app/views/custom_fields/edit.html.erb
  12. +3 −4 app/views/custom_fields/new.html.erb
  13. +1 −1 app/views/enumerations/destroy.html.erb
  14. +1 −1 app/views/enumerations/edit.html.erb
  15. +1 −1 app/views/enumerations/new.html.erb
  16. +1 −1 app/views/groups/edit.html.erb
  17. +1 −1 app/views/groups/new.html.erb
  18. +1 −1 app/views/groups/show.html.erb
  19. +1 −1 app/views/news/show.html.erb
  20. +1 −1 app/views/planning_element_type_colors/confirm_destroy.html.erb
  21. +1 −1 app/views/project_types/confirm_destroy.html.erb
  22. +1 −1 app/views/project_types/edit.html.erb
  23. +2 −2 app/views/projects/show.html.erb
  24. +1 −1 app/views/repositories/diff.html.erb
  25. +16 −8 app/views/roles/_form.html.erb
  26. +1 −1 app/views/roles/edit.html.erb
  27. +1 −1 app/views/roles/new.html.erb
  28. +75 −71 app/views/roles/report.html.erb
  29. +1 −1 app/views/settings/plugin.html.erb
  30. +1 −1 app/views/statuses/edit.html.erb
  31. +1 −1 app/views/statuses/new.html.erb
  32. +1 −1 app/views/timelines/confirm_destroy.html.erb
  33. +1 −1 app/views/timelines/edit.html.erb
  34. +1 −1 app/views/timelines/show.html.erb
  35. +1 −1 app/views/types/edit.html.erb
  36. +1 −1 app/views/types/new.html.erb
  37. +1 −1 app/views/users/_toolbar.html
  38. +1 −1 app/views/users/show.html.erb
  39. +1 −1 app/views/versions/show.html.erb
  40. +1 −1 app/views/wiki/destroy.html.erb
  41. +1 −1 app/views/wiki/edit.html.erb
  42. +1 −1 app/views/wiki/edit_parent_page.html.erb
  43. +1 −1 app/views/wiki/history.html.erb
  44. +1 −1 app/views/wiki/rename.html.erb
  45. +1 −1 app/views/work_packages/calendars/index.html.erb
  46. +0 −1 config/locales/js-en.yml
  47. +7 −7 features/menu_items/wiki_menu_items.feature
  48. +8 −1 features/step_definitions/work_package_steps.rb
  49. +2 −2 features/wiki/parent_page.feature
  50. +1 −1 features/wiki/wiki_add_edit.feature
  51. +1 −1 features/wiki/wiki_create_child.feature
  52. +1 −1 features/wiki/wiki_rename.feature
  53. +2 −2 features/work_packages/editable_fields.feature
  54. +1 −1 features/work_packages/error_on_update.feature
  55. +2 −2 features/work_packages/switch_type.feature
  56. +2 −2 features/work_packages/update.feature
  57. +1 −0 frontend/.gitignore
  58. +2 −1 ...nd/app/components/inplace-edit/directives/field-edit/edit-drop-down/edit-drop-down.directive.html
  59. +11 −19 ...tend/app/components/inplace-edit/directives/field-edit/edit-drop-down/edit-drop-down.directive.js
  60. +1 −1 frontend/app/components/inplace-edit/directives/field-edit/edit-type/edit-type.directive.js
  61. +49 −0 frontend/app/components/open-project.module.test.ts
  62. +32 −0 frontend/app/components/open-project.module.ts
  63. +2 −1 frontend/app/components/routing/controllers/work-package-details.controller.js
  64. +3 −2 frontend/app/components/routing/controllers/work-package-show.controller.js
  65. +1 −1 frontend/app/work_packages/controllers/details-tab-overview-controller.js
  66. +47 −0 frontend/gulpfile.js
  67. +4 −21 frontend/karma.conf.js
  68. +1 −1 frontend/npm-shrinkwrap.json
  69. +5 −5 frontend/package.json
  70. +15 −0 frontend/tsconfig.test.json
  71. +3 −0 frontend/tsd.json
  72. +14,991 −0 frontend/typings/lodash/lodash.d.ts
  73. +1 −0 frontend/typings/tsd.d.ts
  74. +1 −1 lib/open_project/version.rb
  75. +1 −1 lib/tasks/parallel_testing.rake
  76. +6 −3 spec/helpers/sort_helper_spec.rb
  77. +48 −3 spec/helpers/toolbar_helper_spec.rb
View
@@ -230,7 +230,7 @@ platforms :jruby do
end
group :opf_plugins do
- gem 'openproject-translations', git:'https://github.com/opf/openproject-translations.git', tag: 'v5.0.8'
+ gem 'openproject-translations', git:'https://github.com/opf/openproject-translations.git', tag: 'v5.0.9'
end
# TODO: Make this group :optional when bundler v10.x
View
@@ -41,132 +41,132 @@ GIT
GIT
remote: https://github.com/finnlabs/openproject-announcements.git
- revision: 2406d143f54240e9caf8b29a6957350e43a9676c
- tag: v5.0.8
+ revision: bd87f65c2a1b08db1106a824c265cf940a70dd32
+ tag: v5.0.9
specs:
- openproject-announcements (5.0.8)
+ openproject-announcements (5.0.9)
rails (~> 4.2.4)
GIT
remote: https://github.com/finnlabs/openproject-backlogs.git
- revision: bcdd627fc99a368b588ad20f1cf192f6a404f9c4
- tag: v5.0.8
+ revision: 892b8326949c5d2a6c9451d30ec3e07e7fbcae6f
+ tag: v5.0.9
specs:
- openproject-backlogs (5.0.8)
+ openproject-backlogs (5.0.9)
acts_as_silent_list (~> 2.0.0)
openproject-pdf_export
rails (~> 4.2.4)
GIT
remote: https://github.com/finnlabs/openproject-costs.git
- revision: fa2bcf700268ffd7f8e3be1ca3e46fdc88a59aff
- tag: v5.0.8
+ revision: eba6e144f88d2313eadc8e8c63b5d0db5c7b4371
+ tag: v5.0.9
specs:
- openproject-costs (5.0.8)
+ openproject-costs (5.0.9)
rails (~> 4.2.4)
GIT
remote: https://github.com/finnlabs/openproject-github_integration
- revision: 1af4fe577b0214027aa3b98b836776e28efba322
- tag: v5.0.8
+ revision: f47859a64173b157083340d553d990d35f07c82a
+ tag: v5.0.9
specs:
- openproject-github_integration (5.0.8)
+ openproject-github_integration (5.0.9)
openproject-webhooks (~> 5.0.1)
rails (~> 4.2.4)
GIT
remote: https://github.com/finnlabs/openproject-global_roles.git
- revision: 62790609ff7ac426e1ede3c5bb0c402f79cf65ae
- tag: v5.0.8
+ revision: 2a55267407142393fa92a38f2d15d79942d71536
+ tag: v5.0.9
specs:
- openproject-global_roles (5.0.8)
+ openproject-global_roles (5.0.9)
rails (~> 4.2.4)
GIT
remote: https://github.com/finnlabs/openproject-help_link.git
- revision: 68ec9f7be187555c0b3f9543003aaedad96d009f
- tag: v5.0.8
+ revision: 03c3e43cdaedef417748371b736d85f9a8e17e07
+ tag: v5.0.9
specs:
- openproject-help_link (5.0.8)
+ openproject-help_link (5.0.9)
rails (~> 4.2.4)
GIT
remote: https://github.com/finnlabs/openproject-local_avatars
- revision: 67d6f0e9856461f3cf89fba7d3c888adefbe4886
- tag: v5.0.8
+ revision: 95913a2272b6abc01269e49641a85c13c0468233
+ tag: v5.0.9
specs:
- openproject-local_avatars (5.0.8)
+ openproject-local_avatars (5.0.9)
rails (~> 4.2.4)
rmagick (~> 2.15.4)
GIT
remote: https://github.com/finnlabs/openproject-meeting.git
- revision: c831dffa8827acf1d8f39e0962766f904e003529
- tag: v5.0.8
+ revision: 23d4ffe50b8ead6605a66cd5ae5ed6076124b100
+ tag: v5.0.9
specs:
- openproject-meeting (5.0.8)
+ openproject-meeting (5.0.9)
rails (~> 4.2.4)
GIT
remote: https://github.com/finnlabs/openproject-my_project_page.git
- revision: ceee8672a96de3810e6eb1e1abb0a95980708e6c
- tag: v5.0.8
+ revision: fcaed62d0e94af91c1664ddaced7a71ad38c0c53
+ tag: v5.0.9
specs:
- openproject-my_project_page (5.0.8)
+ openproject-my_project_page (5.0.9)
rails (~> 4.2.4)
GIT
remote: https://github.com/finnlabs/openproject-openid_connect.git
- revision: 1b7e75a6d137d506cb783d18481af1d143af153f
- tag: v5.0.8
+ revision: d9391f3b93bd39df6d72096f8a8fe2560036c6ac
+ tag: v5.0.9
specs:
- openproject-openid_connect (5.0.8)
+ openproject-openid_connect (5.0.9)
lobby_boy (~> 0.1)
omniauth-openid_connect-providers (~> 0.1)
openproject-auth_plugins (~> 5.0.1)
rails (~> 4.2.4)
GIT
remote: https://github.com/finnlabs/openproject-pdf_export.git
- revision: a0392b4ba51224280fd87438cb8287dd4f5b6eb2
- tag: v5.0.8
+ revision: bfc5f099d1a38f64ee86f56dd57dc758b91fcc80
+ tag: v5.0.9
specs:
- openproject-pdf_export (5.0.8)
+ openproject-pdf_export (5.0.9)
prawn (~> 0.14.0)
rails (~> 4.2.4)
GIT
remote: https://github.com/finnlabs/openproject-reporting.git
- revision: 3241597ba7aac017fff756a61c503f86f30911a8
- tag: v5.0.8
+ revision: c658a041887f884d4dfb6b203954694dfea82abb
+ tag: v5.0.9
specs:
- openproject-reporting (5.0.8)
+ openproject-reporting (5.0.9)
openproject-costs (>= 5.0.1)
rails (~> 4.2.4)
reporting_engine (>= 1.1.0)
GIT
remote: https://github.com/finnlabs/openproject-themes-dark.git
- revision: 17673fbbd63826124845f296bccdda0877125dc0
- tag: v5.0.8
+ revision: 662f3bb525f99738ec7128bb6b981c27c66e1cc7
+ tag: v5.0.9
specs:
- openproject-themes-dark (5.0.8)
+ openproject-themes-dark (5.0.9)
rails (~> 4.2.4)
GIT
remote: https://github.com/finnlabs/openproject-webhooks
- revision: 6a15185ccd886e064d75bcfeabcce26920245a52
- tag: v5.0.8
+ revision: 79ed21b40ee588127d011d360b6be51bd9e46d9c
+ tag: v5.0.9
specs:
- openproject-webhooks (5.0.8)
+ openproject-webhooks (5.0.9)
rails (~> 4.2.4)
GIT
remote: https://github.com/finnlabs/openproject-xls_export.git
- revision: 2acaba7076309460c31ce439479f527bb2336ba7
- tag: v5.0.8
+ revision: 601f1036d9fdaf24f934c2fedf2fe395cd387a3c
+ tag: v5.0.9
specs:
- openproject-xls_export (5.0.8)
+ openproject-xls_export (5.0.9)
rails (~> 4.2.4)
spreadsheet (~> 0.8.9)
@@ -180,7 +180,7 @@ GIT
GIT
remote: https://github.com/finnlabs/reporting_engine.git
- revision: 7de0279197ab9c2c6cab102d24ad6075433cfe97
+ revision: f4ba5beb1f1413b9c66bf5a3e458b547202dc4ee
branch: dev
specs:
reporting_engine (1.2.0)
@@ -203,27 +203,27 @@ GIT
GIT
remote: https://github.com/opf/openproject-auth_plugins.git
- revision: 2e02c2c0b5ae330b984fe101848f66a6000a90c2
- tag: v5.0.8
+ revision: b65041ede419506c76cf6d4f265fc6c3e45a9b39
+ tag: v5.0.9
specs:
- openproject-auth_plugins (5.0.8)
+ openproject-auth_plugins (5.0.9)
omniauth (~> 1.0)
rails (~> 4.2.4)
GIT
remote: https://github.com/opf/openproject-documents.git
- revision: ff1d4d59ddd71bf2a10297b08b90715bf36a494a
- tag: v5.0.8
+ revision: 1846b99faffecdfc87609d26c9073189bcec23c8
+ tag: v5.0.9
specs:
- openproject-documents (5.0.8)
+ openproject-documents (5.0.9)
rails (~> 4.2.4)
GIT
remote: https://github.com/opf/openproject-translations.git
- revision: 093ad873d8e1dbb6dc9619a4a3d8bd63cec71697
- tag: v5.0.8
+ revision: 87b499116bd30679916dda76609d22065e0970be
+ tag: v5.0.9
specs:
- openproject-translations (5.0.8)
+ openproject-translations (5.0.9)
crowdin-api (~> 0.4.0)
mixlib-shellout (~> 2.1.0)
rails (~> 4.2.3)
View
@@ -1,4 +1,4 @@
-CORE_VERSION = 'v5.0.8'
+CORE_VERSION = 'v5.0.9'
# the dependencies from the gemspec from a git repo are ignored
# see also https://github.com/bundler/bundler/issues/1041
@@ -275,7 +275,7 @@ def sort_header_tag(column, options = {})
options[:title] = sort_header_title(column, options)
within_sort_header_tag_hierarchy(options, sort_class(column)) do
- sort_link(column, caption, default_order, lang: lang)
+ sort_link(column, caption, default_order, lang: lang, title: options[:title])
end
end
@@ -1,9 +1,12 @@
module ToolbarHelper
- def toolbar(title:, subtitle: '', html: {})
+ include ERB::Util
+ include ActionView::Helpers::OutputSafetyHelper
+
+ def toolbar(title:, subtitle: '', link_to: nil, html: {})
classes = ['toolbar-container', html[:class]].compact.join(' ')
content_tag :div, class: classes do
toolbar = content_tag :div, class: 'toolbar' do
- dom_title(title) + dom_toolbar {
+ dom_title(title, link_to) + dom_toolbar {
yield if block_given?
}
end
@@ -12,11 +15,23 @@ def toolbar(title:, subtitle: '', html: {})
end
end
+ def breadcrumb_toolbar(*elements, subtitle: '', html: {}, &block)
+ toolbar(title: safe_join(elements, ' &raquo '.html_safe), subtitle: subtitle, html: html, &block)
+ end
+
protected
- def dom_title(title)
+ def dom_title(raw_title, link_to = nil)
+ title = ''.html_safe
+ title << raw_title
+
+ if link_to.present?
+ title << ': '
+ title << link_to
+ end
+
content_tag :div, class: 'title-container' do
- content_tag(:h2, title, title: title)
+ content_tag(:h2, title)
end
end
@@ -26,8 +41,4 @@ def dom_toolbar
yield
end
end
-
- def decode(string)
- raw(strip_tags(string)).strip
- end
end
@@ -89,9 +89,9 @@ def wiki_storage_sql
<<-SQL
SELECT wiki.project_id, SUM(wiki_attached.filesize) AS filesize
FROM #{Wiki.table_name} wiki
- LEFT JOIN #{WikiPage.table_name} pages
+ JOIN #{WikiPage.table_name} pages
ON pages.wiki_id = wiki.id
- LEFT JOIN #{Attachment.table_name} wiki_attached
+ JOIN #{Attachment.table_name} wiki_attached
ON (wiki_attached.container_id = pages.id AND wiki_attached.container_type = 'WikiPage')
GROUP BY wiki.project_id
SQL
@@ -101,7 +101,7 @@ def work_package_sql
<<-SQL
SELECT wp.project_id, SUM(wp_attached.filesize) AS filesize
FROM #{WorkPackage.table_name} wp
- LEFT JOIN #{Attachment.table_name} wp_attached
+ JOIN #{Attachment.table_name} wp_attached
ON (wp_attached.container_id = wp.id AND wp_attached.container_type = 'WorkPackage')
GROUP BY wp.project_id
SQL
@@ -29,7 +29,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= call_hook :activity_index_head %>
-<%= toolbar title: (@author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe),
+<%= toolbar title: (@author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author))).html_safe,
subtitle: l(:label_date_from_to, start: format_date(@date_to - @days), end: format_date(@date_to-1))
%>
@@ -28,7 +28,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% html_title l(:label_administration), "#{l(:label_edit)} #{l(:label_auth_source)} #{@auth_source.name}" %>
-<%= toolbar title: "#{l(:label_auth_source)} (#{h @auth_source.auth_method_name})" %>
+<%= toolbar title: "#{l(:label_auth_source)} (#{@auth_source.auth_method_name})" %>
<%= labelled_tabular_form_for @auth_source, as: :auth_source do |f| %>
<%= render partial: 'form', locals: { f: f } %>
@@ -28,7 +28,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% html_title l(:label_administration), l(:label_auth_source_new) %>
-<%= toolbar title: "#{l(:label_auth_source_new)} (#{h @auth_source.auth_method_name})" %>
+<%= toolbar title: "#{l(:label_auth_source_new)} (#{@auth_source.auth_method_name})" %>
<%= labelled_tabular_form_for @auth_source, as: :auth_source do |f| %>
<%= render partial: 'form', locals: { f: f } %>
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-<%= toolbar title: "#{Category.model_name.human} #{h @category.name}" %>
+<%= toolbar title: "#{Category.model_name.human} #{@category.name}" %>
<%= form_tag({}, {method: :delete}) do %>
<div class="box">
<p><strong><%= l(:text_work_package_category_destroy_question, @issue_count) %></strong></p>
@@ -29,10 +29,9 @@ See doc/COPYRIGHT.rdoc for more details.
<% html_title l(:label_administration), "#{l(:label_edit)} #{CustomField.model_name.human} #{h @custom_field.name}" %>
-<%= toolbar title: %{#{link_to l(:label_custom_field_plural), custom_fields_path}
- &raquo; #{link_to l(@custom_field.type_name), custom_fields_path(tab: @custom_field.type)}
- &raquo; #{@custom_field.name}
- }.squish
+<%= breadcrumb_toolbar link_to(l(:label_custom_field_plural), custom_fields_path),
+ link_to(l(@custom_field.type_name), custom_fields_path(tab: @custom_field.type)),
+ @custom_field.name
%>
<%= labelled_tabular_form_for @custom_field, as: :custom_field,
@@ -28,10 +28,9 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<% html_title l(:label_administration), l(:label_custom_field_new) %>
-<%= toolbar title: %{#{link_to l(:label_custom_field_plural), custom_fields_path}
- &raquo; #{link_to l(@custom_field.type_name), custom_fields_path(tab: @custom_field.type)}
- &raquo; #{l(:label_custom_field_new)}
- }.squish
+<%= breadcrumb_toolbar link_to(l(:label_custom_field_plural), custom_fields_path),
+ link_to(l(@custom_field.type_name), custom_fields_path(tab: @custom_field.type)),
+ l(:label_custom_field_new)
%>
<%= labelled_tabular_form_for @custom_field, as: :custom_field,
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
-<%= toolbar title: "#{link_to l(@enumeration.option_name), enumerations_path} &raquo; #{h @enumeration}" %>
+<%= breadcrumb_toolbar link_to(l(@enumeration.option_name), enumerations_path}, @enumeration %>
<%= styled_form_tag({}, method: :delete) do %>
<section class="form--section">
<p><strong><%= l(:text_enumeration_destroy_question, @enumeration.objects_count) %></strong></p>
Oops, something went wrong.

0 comments on commit 9de29aa

Please sign in to comment.