Mercurial > hg > soundsoftware-site
changeset 357:3ca3a0255e2a cannam-pre-20110113-merge
Merge from branch "live"
author | Chris Cannam |
---|---|
date | Fri, 01 Apr 2011 09:38:13 +0100 |
parents | debf12a566cd (current diff) 9ccc63655a21 (diff) |
children | 9b25cd1b459b 96cfb24411c6 |
files | |
diffstat | 2 files changed, 1 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/app/controllers/files_controller.rb Fri Apr 01 09:37:45 2011 +0100 +++ b/app/controllers/files_controller.rb Fri Apr 01 09:38:13 2011 +0100 @@ -8,7 +8,7 @@ include SortHelper def index - sort_init 'active', 'asc' + sort_init 'active', 'desc' sort_update 'filename' => "#{Attachment.table_name}.filename", 'active' => "#{Attachment.table_name}.active", 'created_on' => "#{Attachment.table_name}.created_on",
--- a/extra/soundsoftware/reposman-soundsoftware.rb Fri Apr 01 09:37:45 2011 +0100 +++ b/extra/soundsoftware/reposman-soundsoftware.rb Fri Apr 01 09:38:13 2011 +0100 @@ -346,14 +346,5 @@ log("\trepository #{repos_path} created"); end - if project.respond_to?(:repository) and project.repository.is_external? - external_url = project.repository.external_url; - log("\tproject #{project.identifier} has external repository url #{external_url}"); - if !external_url.match(/^https?:/) - # wot about git, svn/svn+ssh, etc? should we just check for a scheme at all? - log("\tthis is not an http(s) url: ignoring"); - end - end - end