diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 7cc76a128..9a3e2d70f 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -19,7 +19,7 @@ class ProjectsController < ApplicationController layout 'base_projects'# by young menu_item :overview menu_item :roadmap, :only => :roadmap - menu_item :settings, :only => :settings +# menu_item :settings, :only => :settings before_filter :find_project, :except => [ :index, :list, :new, :create, :copy ] before_filter :authorize, :except => [ :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy, :member, :focus, :file, :statistics, :feedback] diff --git a/app/views/bids/show.html.erb b/app/views/bids/show.html.erb index 97dbbdbb0..06b38307b 100644 --- a/app/views/bids/show.html.erb +++ b/app/views/bids/show.html.erb @@ -12,7 +12,7 @@ <% elsif @bid.reward_type == 2%> <%= l(:label_bids_reward_method) %><%= @bid.budget%> <% else %> - <%= l(:label_bids_reward_method) %><%= l(:label_bids_credit) %> <%= @bid.budget%><%= l(:label_bids_credit_number) %> + <%= l(:label_bids_reward_method) %><%= l(:label_bids_credit) %> <%= @bid.budget%><%= l(:label_bids_credit_number) %> <% end %> diff --git a/app/views/projects/settings/_repositories.html.erb b/app/views/projects/settings/_repositories.html.erb index 1d8b778e6..c0f4d263b 100644 --- a/app/views/projects/settings/_repositories.html.erb +++ b/app/views/projects/settings/_repositories.html.erb @@ -21,7 +21,7 @@ <%= checked_image repository.is_default? %> <%=h repository.scm_name %> <%if repository.scm_name=="Git"%> - http://<%= repository.login.to_s %>@<%= ip %><%=h repository.url.slice(project_path_cut, repository.url.length) %> + http://<%= repository.login.to_s %>_<%= repository.identifier.to_s%>@<%= ip %><%=h repository.url.slice(project_path_cut, repository.url.length) %> <%else %> <%=h repository.url %> <% end %> diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index 55206a83c..f63baa955 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -11,7 +11,7 @@ :locals => { :path => @path, :kind => 'dir', :revision => @rev } %>
<%if @repository.type.to_s=="Repository::Git"%> - http://<%= @repository.login.to_s %>@<%= ip %><%=h @repository.url.slice(project_path_cut, @repository.url.length) %> + http://<%= @repository.login.to_s %>_<%= @repository.identifier.to_s%>@<%= ip %><%=h @repository.url.slice(project_path_cut, @repository.url.length) %> <%else %> <%=h @repository.url %> <% end %>