Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#34: refactoring of Project#git_project_address method

This commit is contained in:
Vokhmin Alexey V 2013-05-16 17:26:29 +04:00
parent edb07417d8
commit 29d50b9959
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/project.rb
View File

@ -138,7 +138,7 @@ class Project < ActiveRecord::Base
owner == user owner == user
end end
def git_project_address auth_user def git_project_address(auth_user = nil)
host ||= EventLog.current_controller.request.host_with_port rescue ::Rosa::Application.config.action_mailer.default_url_options[:host] host ||= EventLog.current_controller.request.host_with_port rescue ::Rosa::Application.config.action_mailer.default_url_options[:host]
protocol = APP_CONFIG['mailer_https_url'] ? "https" : "http" rescue "http" protocol = APP_CONFIG['mailer_https_url'] ? "https" : "http" rescue "http"
opts = {:host => host, :protocol => protocol} opts = {:host => host, :protocol => protocol}
@ -243,7 +243,7 @@ class Project < ActiveRecord::Base
end end
def html_url def html_url
git_project_address(nil).gsub(/.git$/, '') git_project_address.gsub(/.git$/, '')
end end
protected protected