Redmine 3.4.4

app/views/groups/_form.html.erb

@@ -0,0 +1,10 @@
+<%= error_messages_for @group %>
+
+<div class="box tabular">
+  <p><%= f.text_field :name, :required => true, :size => 60,
+           :disabled => !@group.safe_attribute?('name')  %></p>
+
+  <% @group.custom_field_values.each do |value| %>
+    <p><%= custom_field_tag_with_label :group, value %></p>
+  <% end %>
+</div>

app/views/groups/_general.html.erb

@@ -0,0 +1,4 @@
+<%= labelled_form_for @group, :url => group_path(@group), :html => {:multipart => true} do |f| %>
+<%= render :partial => 'form', :locals => { :f => f } %>
+<%= submit_tag l(:button_save) %>
+<% end %>

app/views/groups/_memberships.html.erb

@@ -0,0 +1 @@
+<%= render_principal_memberships @group %>

app/views/groups/_new_users_form.html.erb

@@ -0,0 +1,9 @@
+<fieldset class="box">
+  <legend><%= label_tag "user_search", l(:label_user_search) %></legend>
+  <p><%= text_field_tag 'user_search', nil %></p>
+  <%= javascript_tag "observeSearchfield('user_search', null, '#{ escape_javascript autocomplete_for_user_group_path(@group) }')" %>
+
+  <div id="users">
+    <%= render_principals_for_new_group_users(@group) %>
+  </div>
+</fieldset>

app/views/groups/_new_users_modal.html.erb

@@ -0,0 +1,9 @@
+<h3 class="title"><%= l(:label_user_new) %></h3>
+
+<%= form_for(@group, :url => group_users_path(@group), :remote => true, :method => :post) do |f| %>
+  <%= render :partial => 'new_users_form' %>
+  <p class="buttons">
+    <%= submit_tag l(:button_add) %>
+    <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %>
+  </p>
+<% end %>

app/views/groups/_users.html.erb

@@ -0,0 +1,22 @@
+<p><%= link_to l(:label_user_new), new_group_users_path(@group), :remote => true, :class => "icon icon-add" %></p>
+
+<% if @group.users.any? %>
+  <table class="list users">
+    <thead><tr>
+      <th><%= l(:label_user) %></th>
+      <th style="width:15%"></th>
+    </tr></thead>
+    <tbody>
+    <% @group.users.sort.each do |user| %>
+      <tr id="user-<%= user.id %>">
+        <td class="name"><%= link_to_user user %></td>
+        <td class="buttons">
+          <%= delete_link group_user_path(@group, :user_id => user), :remote => true %>
+        </td>
+      </tr>
+    <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>

app/views/groups/add_users.js.erb

@@ -0,0 +1,5 @@
+hideModal();
+$('#tab-content-users').html('<%= escape_javascript(render :partial => 'groups/users') %>');
+<% @users.each do |user| %>
+  $('#user-<%= user.id %>').effect("highlight");
+<% end %>

app/views/groups/autocomplete_for_user.js.erb

@@ -0,0 +1 @@
+$('#users').html('<%= escape_javascript(render_principals_for_new_group_users(@group)) %>');

app/views/groups/destroy_membership.js.erb

@@ -0,0 +1 @@
+$('#tab-content-memberships').html('<%= escape_javascript(render :partial => 'groups/memberships') %>');

app/views/groups/edit.html.erb

@@ -0,0 +1,3 @@
+<%= title [l(:label_group_plural), groups_path], @group.name %>
+
+<%= render_tabs group_settings_tabs(@group) %>

app/views/groups/edit_membership.js.erb

@@ -0,0 +1,6 @@
+<% if @membership.valid? %>
+  $('#tab-content-memberships').html('<%= escape_javascript(render :partial => 'groups/memberships') %>');
+  $('#member-<%= @membership.id %>').effect("highlight");
+<% else %>
+  alert('<%= raw(escape_javascript(l(:notice_failed_to_save_members, :errors => @membership.errors.full_messages.join(', ')))) %>');
+<% end %>

app/views/groups/index.api.rsb

@@ -0,0 +1,11 @@
+api.array :groups do
+  @groups.each do |group|
+    api.group do
+      api.id         group.id
+      api.name       group.lastname
+      api.builtin    group.builtin_type if group.builtin_type
+
+      render_api_custom_values group.visible_custom_field_values, api
+    end
+  end
+end

app/views/groups/index.html.erb

@@ -0,0 +1,39 @@
+<div class="contextual">
+<%= link_to l(:label_group_new), new_group_path, :class => 'icon icon-add' %>
+</div>
+
+<%= title l(:label_group_plural) %>
+
+<%= form_tag(groups_path, :method => :get) do %>
+<fieldset><legend><%= l(:label_filter_plural) %></legend>
+  <label for='name'><%= l(:label_group) %>:</label>
+  <%= text_field_tag 'name', params[:name], :size => 30 %>
+  <%= submit_tag l(:button_apply), :class => "small", :name => nil %>
+  <%= link_to l(:button_clear), groups_path, :class => 'icon icon-reload' %>
+  </fieldset>
+<% end %>
+&nbsp;
+
+<% if @groups.any? %>
+<div class="autoscroll">
+<table class="list groups">
+  <thead><tr>
+  <th><%=l(:label_group)%></th>
+  <th><%=l(:label_user_plural)%></th>
+  <th></th>
+  </tr></thead>
+  <tbody>
+<% @groups.each do |group| %>
+  <tr id="group-<%= group.id %>" class="<%= "builtin" if group.builtin? %>">
+    <td class="name"><%= link_to group, edit_group_path(group) %></td>
+    <td class="user_count"><%= (@user_count_by_group_id[group.id] || 0) unless group.builtin? %></td>
+    <td class="buttons"><%= delete_link group unless group.builtin? %></td>
+  </tr>
+<% end %>
+  </tbody>
+</table>
+</div>
+<span class="pagination"><%= pagination_links_full @group_pages, @group_count %></span>
+<% else %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>

app/views/groups/new.html.erb

@@ -0,0 +1,9 @@
+<%= title [l(:label_group_plural), groups_path], l(:label_group_new) %>
+
+<%= labelled_form_for @group, :html => {:multipart => true} do |f| %>
+<%= render :partial => 'form', :locals => { :f => f } %>
+<p>
+  <%= f.submit l(:button_create) %>
+  <%= f.submit l(:button_create_and_continue), :name => 'continue' %>
+</p>
+<% end %>

app/views/groups/new_users.html.erb

@@ -0,0 +1,6 @@
+<h2><%= l(:label_user_new) %></h2>
+
+<%= form_for(@group, :url => group_users_path(@group), :method => :post) do |f| %>
+  <%= render :partial => 'new_users_form' %>
+  <p><%= submit_tag l(:button_add) %></p>
+<% end %>

app/views/groups/new_users.js.erb

@@ -0,0 +1,2 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'groups/new_users_modal') %>');
+showModal('ajax-modal', '700px');

app/views/groups/remove_user.js.erb

@@ -0,0 +1 @@
+$('#tab-content-users').html('<%= escape_javascript(render :partial => 'groups/users') %>');

app/views/groups/show.api.rsb

@@ -0,0 +1,31 @@
+api.group do
+  api.id         @group.id
+  api.name       @group.lastname
+  api.builtin    @group.builtin_type if @group.builtin_type
+
+  render_api_custom_values @group.visible_custom_field_values, api
+
+  api.array :users do
+    @group.users.each do |user|
+      api.user :id => user.id, :name => user.name
+    end
+  end if include_in_api_response?('users') && !@group.builtin?
+
+  api.array :memberships do
+    @group.memberships.preload(:roles, :project).each do |membership|
+      api.membership do
+        api.id membership.id
+        api.project :id => membership.project.id, :name => membership.project.name
+        api.array :roles do
+          membership.member_roles.each do |member_role|
+            if member_role.role
+              attrs = {:id => member_role.role.id, :name => member_role.role.name}
+              attrs.merge!(:inherited => true) if member_role.inherited_from.present?
+              api.role attrs
+            end
+          end
+        end
+      end if membership.project
+    end
+  end if include_in_api_response?('memberships')
+end

app/views/groups/show.html.erb

@@ -0,0 +1,7 @@
+<%= title [l(:label_group_plural), groups_path], @group.name %>
+
+<ul>
+<% @group.users.each do |user| %>
+    <li><%= user %></li>
+<% end %>
+</ul>