From f60ca696a14d62d365ae4f1be533fea7520452d8 Mon Sep 17 00:00:00 2001 From: Henriette Dinger Date: Fri, 15 Apr 2016 08:43:26 +0200 Subject: [PATCH 1/2] Change condition and link of 'add member' button --- .../my_projects_overviews/blocks/_members.html.erb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/my_projects_overviews/blocks/_members.html.erb b/app/views/my_projects_overviews/blocks/_members.html.erb index f7021baf49..5b48a118a3 100644 --- a/app/views/my_projects_overviews/blocks/_members.html.erb +++ b/app/views/my_projects_overviews/blocks/_members.html.erb @@ -25,7 +25,7 @@ See doc/COPYRIGHT.md for more details.

- <%=l(:label_member_plural)%> + <%=t(:label_member_plural)%>

<% if @project.members.count > 0 && users_by_role(50).any? %> @@ -44,10 +44,10 @@ See doc/COPYRIGHT.md for more details. <% end %>

- <% if current_user.admin? %> - <%= link_to new_user_path, class: 'button -alt-highlight' do %> - - <%= l('activerecord.models.member') %> - <% end %> +<% end %> +<% if current_user.admin? %> + <%= link_to new_project_member_path(project_id: project.identifier), class: 'button -alt-highlight' do %> + + <%= t('activerecord.models.member') %> <% end %> <% end %> From 88b082efc7b8cd645ea4673ca590d8636bc8fca0 Mon Sep 17 00:00:00 2001 From: Markus Kahl Date: Fri, 15 Apr 2016 09:57:34 +0100 Subject: [PATCH 2/2] added missing Gemfile.plugins to make travis work --- Gemfile.plugins | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 Gemfile.plugins diff --git a/Gemfile.plugins b/Gemfile.plugins new file mode 100644 index 0000000000..1b89dae126 --- /dev/null +++ b/Gemfile.plugins @@ -0,0 +1,7 @@ +# Used by travis to bundle this plugin with the OpenProject core. +# The tested plugin will be moved to the path `./plugins/this` +# whereas OpenProject will be checked out to `.`. + +gem 'openproject-my_project_page', path: 'plugins/this' + +# If the plugin has any dependencies declare them here: