Adds a "visible" option on User and Project custom fields (#1738).

If set to false, the custom field won't be display on user profile/project overview.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4382 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/controllers/users_controller.rb

@@ -51,7 +51,6 @@ class UsersController < ApplicationController
   
   def show
     @user = User.find(params[:id])
-    @custom_values = @user.custom_values
     
     # show projects based on current user visibility
     @memberships = @user.memberships.all(:conditions => Project.visible_by(User.current))

app/models/custom_value.rb

@@ -34,6 +34,10 @@ class CustomValue < ActiveRecord::Base
     custom_field.editable?
   end
   
+  def visible?
+    custom_field.visible?
+  end
+  
   def required?
     custom_field.is_required?
   end

app/views/custom_fields/_form.rhtml

@@ -86,10 +86,12 @@ when "IssueCustomField" %>
     
 <% when "UserCustomField" %>
     <p><%= f.check_box :is_required %></p>
+    <p><%= f.check_box :visible %></p>
     <p><%= f.check_box :editable %></p>
 
 <% when "ProjectCustomField" %>
     <p><%= f.check_box :is_required %></p>
+    <p><%= f.check_box :visible %></p>
     <p><%= f.check_box :searchable %></p>
 
 <% when "TimeEntryCustomField" %>

app/views/projects/index.xml.builder

@@ -8,7 +8,7 @@ xml.projects :type => 'array' do
       xml.description project.description
       xml.parent(:id => project.parent_id, :name => project.parent.name) unless project.parent.nil?
       xml.custom_fields do
-        project.custom_field_values.each do |custom_value|
+        project.visible_custom_field_values.each do |custom_value|
           xml.custom_field custom_value.value, :id => custom_value.custom_field_id, :name => custom_value.custom_field.name
         end
       end unless project.custom_field_values.empty?

app/views/projects/show.rhtml

@@ -16,7 +16,7 @@
  	<li><%=l(:label_subproject_plural)%>:
 	    <%= @subprojects.collect{|p| link_to(h(p), :action => 'show', :id => p)}.join(", ") %></li>
   <% end %>
-	<% @project.custom_values.each do |custom_value| %>
+	<% @project.visible_custom_field_values.each do |custom_value| %>
 	<% if !custom_value.value.blank? %>
 	   <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
 	<% end %>

app/views/projects/show.xml.builder

@@ -7,7 +7,7 @@ xml.project do
   xml.homepage    @project.homepage
   
   xml.custom_fields do
-    @project.custom_field_values.each do |custom_value|
+    @project.visible_custom_field_values.each do |custom_value|
       xml.custom_field custom_value.value, :id => custom_value.custom_field_id, :name => custom_value.custom_field.name
     end
   end unless @project.custom_field_values.empty?

app/views/users/show.rhtml

@@ -9,7 +9,7 @@
 	<% unless @user.pref.hide_mail %>
 		<li><%=l(:field_mail)%>: <%= mail_to(h(@user.mail), nil, :encode => 'javascript') %></li>
 	<% end %>
-	<% for custom_value in @custom_values %>
+	<% @user.visible_custom_field_values.each do |custom_value| %>
 	<% if !custom_value.value.blank? %>
     <li><%=h custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
 	<% end %>