diff --git a/app/models/user.rb b/app/models/user.rb index 45c7ae645..1bce98052 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -161,6 +161,18 @@ class User < Principal false end end + + def show_name + unless self.user_extensions.nil? + if self.user_extensions.identity == 2 + firstname + else + lastname+firstname + end + else + lastname+firstname + end + end ## end def count_new_jour diff --git a/app/views/bids/_list_projects.html.erb b/app/views/bids/_list_projects.html.erb index 9a9f2ec70..38e2ece34 100644 --- a/app/views/bids/_list_projects.html.erb +++ b/app/views/bids/_list_projects.html.erb @@ -19,7 +19,7 @@ - + <% if get_prize(b_project).nil? or get_prize(b_project) == "" %> diff --git a/app/views/bids/_project_list.html.erb b/app/views/bids/_project_list.html.erb index 293392b17..50f34d3d8 100644 --- a/app/views/bids/_project_list.html.erb +++ b/app/views/bids/_project_list.html.erb @@ -14,7 +14,7 @@ <% end %> -<% @bidding_project.each do |b_project|%> + <% else %> @@ -68,7 +68,7 @@ <% end %>
-<% @bidding_project.each do |b_project|%> + <% end %> -<% end %> +<%= render :partial=> "list_projects",:locals => {:bidding_project => @bidding_project,:bid => @bid }%> diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index aa0c2fa7a..0cceb69ac 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -483,13 +483,13 @@ $().ready(function(){

- + -->