Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-05-06 07:25:30 +02:00
Code Issues Packages Projects Releases Activity

User groups feature initial commit.

Browse Source 
git-svn-id: http://redmine.rubyforge.org/svn/branches/work@1373 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2008-04-28 15:10:04 +00:00
parent 4783d3d7c5
commit ced3cab7bb
41 changed files with 812 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
groups/app/views/users/_form.rhtml
View File

@@ -7,6 +7,9 @@
<p><%= f.text_field :firstname, :required => true %></p>
<p><%= f.text_field :lastname, :required => true %></p>
<p><%= f.text_field :mail, :required => true %></p>
<% unless @groups.empty? -%>
<p><%= f.select :group_id, @groups.collect {|g| [g.name, g.id]}, { :include_blank => true } %></p>
<% end -%>
<p><%= f.select :language, lang_options_for_select %></p>
<% for @custom_value in @custom_values %>

6
groups/app/views/users/_memberships.rhtml
View File

@@ -1,7 +1,7 @@
<div class="box" style="margin-top: 16px;">
<h3><%= l(:label_project_plural) %></h3>
<% @user.memberships.each do |membership| %>
<% @user.memberships.select {|m| m.inherited_from.nil? }.each do |membership| %>
<% form_tag({ :action => 'edit_membership', :id => @user, :membership_id => membership }, :class => "tabular") do %>
<p style="margin:0;padding-top:0;">
<label><%= membership.project.name %></label>
@@ -13,6 +13,8 @@
</p>
<% end %>
<% end %>
<% unless @projects.empty? || @roles.empty? %>
<hr />
<p>
<label><%=l(:label_project_new)%></label><br/>
@@ -20,10 +22,12 @@
<select name="membership[project_id]">
<%= options_from_collection_for_select @projects, "id", "name", @membership.project_id %>
</select>
<%= l(:label_role) %>:
<select name="membership[role_id]">
<%= options_from_collection_for_select @roles, "id", "name", @membership.role_id %>
</select>
<%= submit_tag l(:button_add) %>
<% end %>
</p>
<% end %>
</div>

8
groups/app/views/users/list.rhtml
View File

@@ -18,6 +18,7 @@
<%= sort_header_tag('firstname', :caption => l(:field_firstname)) %>
<%= sort_header_tag('lastname', :caption => l(:field_lastname)) %>
<%= sort_header_tag('mail', :caption => l(:field_mail)) %>
<%= sort_header_tag("#{Group.table_name}.name", :caption => l(:field_group)) %>
<%= sort_header_tag('admin', :caption => l(:field_admin), :default_order => 'desc') %>
<%= sort_header_tag('created_on', :caption => l(:field_created_on), :default_order => 'desc') %>
<%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on), :default_order => 'desc') %>
@@ -27,9 +28,10 @@
<% for user in @users -%>
<tr class="user <%= cycle("odd", "even") %> <%= %w(anon active registered locked)[user.status] %>">
<td class="username"><%= link_to user.login, :action => 'edit', :id => user %></td>
<td class="firstname"><%= user.firstname %></td>
<td class="lastname"><%= user.lastname %></td>
<td class="email"><%= user.mail %></td>
<td class="firstname"><%=h user.firstname %></td>
<td class="lastname"><%=h user.lastname %></td>
<td class="email"><%=h user.mail %></td>
<td class="group"><%=h user.group %></td>
<td align="center"><%= image_tag('true.png') if user.admin? %></td>
<td class="created_on" align="center"><%= format_time(user.created_on) %></td>
<td class="last_login_on" align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>