7 files changed, 12 insertions, 8 deletions
diff --git a/app/views/groups/_form.html.erb b/app/views/groups/_form.html.erb
index 7dc224061..9d5b087e1 100644
--- a/app/views/groups/_form.html.erb
+++ b/app/views/groups/_form.html.erb
@@ -1,7 +1,9 @@
 <%= error_messages_for @group %>
 
 <div class="box tabular">
-  <p><%= f.text_field :name, :required => true, :size => 60 %></p>
+  <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 %>
diff --git a/app/views/groups/_general.html.erb b/app/views/groups/_general.html.erb
index 8c720c3ee..c48f54cd4 100644
--- a/app/views/groups/_general.html.erb
+++ b/app/views/groups/_general.html.erb
@@ -1,4 +1,4 @@
-<%= labelled_form_for @group do |f| %>
+<%= labelled_form_for @group, :url => group_path(@group) do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
 <% end %>
diff --git a/app/views/groups/edit.html.erb b/app/views/groups/edit.html.erb
index 43be52f30..b2f37bde1 100644
--- a/app/views/groups/edit.html.erb
+++ b/app/views/groups/edit.html.erb
@@ -1,3 +1,3 @@
 <%= title [l(:label_group_plural), groups_path], @group.name %>
 
-<%= render_tabs group_settings_tabs %>
+<%= render_tabs group_settings_tabs(@group) %>
diff --git a/app/views/groups/index.api.rsb b/app/views/groups/index.api.rsb
index 6a4efeaf7..8ebad1baf 100644
--- a/app/views/groups/index.api.rsb
+++ b/app/views/groups/index.api.rsb
@@ -3,6 +3,7 @@ api.array :groups do
     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
diff --git a/app/views/groups/index.html.erb b/app/views/groups/index.html.erb
index 22c89eff4..a600ca48d 100644
--- a/app/views/groups/index.html.erb
+++ b/app/views/groups/index.html.erb
@@ -12,10 +12,10 @@
   </tr></thead>
   <tbody>
 <% @groups.each do |group| %>
-  <tr id="group-<%= group.id %>" class="<%= cycle 'odd', 'even' %>">
+  <tr id="group-<%= group.id %>" class="<%= cycle 'odd', 'even' %> <%= "builtin" if group.builtin? %>">
     <td class="name"><%= link_to h(group), edit_group_path(group) %></td>
-    <td class="user_count"><%= @user_count_by_group_id[group.id] || 0 %></td>
-    <td class="buttons"><%= delete_link 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>
diff --git a/app/views/groups/show.api.rsb b/app/views/groups/show.api.rsb
index 626474410..15211f2cf 100644
--- a/app/views/groups/show.api.rsb
+++ b/app/views/groups/show.api.rsb
@@ -1,6 +1,7 @@
 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
 
@@ -8,7 +9,7 @@ api.group do
     @group.users.each do |user|
       api.user :id => user.id, :name => user.name
     end
-  end if include_in_api_response?('users')
+  end if include_in_api_response?('users') && !@group.builtin?
 
   api.array :memberships do
     @group.memberships.each do |membership|
diff --git a/app/views/users/_groups.html.erb b/app/views/users/_groups.html.erb
index 1203d3b59..1f54a8944 100644
--- a/app/views/users/_groups.html.erb
+++ b/app/views/users/_groups.html.erb
@@ -1,6 +1,6 @@
 <%= form_for(:user, :url => { :action => 'update' }, :html => {:method => :put}) do %>
 <div class="box">
-<% Group.all.sort.each do |group| %>
+<% Group.givable.sort.each do |group| %>
 <label><%= check_box_tag 'user[group_ids][]', group.id, @user.groups.include?(group), :id => nil %> <%=h group %></label><br />
 <% end %>
 <%= hidden_field_tag 'user[group_ids][]', '' %>