summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Sørensen <johan@johansorensen.com>2009-02-12 15:17:39 +0100
committerJohan Sørensen <johan@johansorensen.com>2009-04-22 14:05:23 +0200
commitb01408c662a85f692695bddd8e1e84b694feccd6 (patch)
tree2f95d9dc9f23a14691b37fdf2b02b7b1cabd2cc1
parentad35b4cff085a143746ddfe052728040bff805e5 (diff)
downloadgitorious-mainline-outdated-b01408c662a85f692695bddd8e1e84b694feccd6.zip
gitorious-mainline-outdated-b01408c662a85f692695bddd8e1e84b694feccd6.tar.gz
gitorious-mainline-outdated-b01408c662a85f692695bddd8e1e84b694feccd6.tar.bz2
Show the archive-box right away and don't put items on the queue if it looks
like a worker has already begun archiving it
-rw-r--r--app/controllers/trees_controller.rb4
-rw-r--r--public/javascripts/application.js4
2 files changed, 6 insertions, 2 deletions
diff --git a/app/controllers/trees_controller.rb b/app/controllers/trees_controller.rb
index bef5139..2f3b108 100644
--- a/app/controllers/trees_controller.rb
+++ b/app/controllers/trees_controller.rb
@@ -66,7 +66,9 @@ class TreesController < ApplicationController
end
else
# enqueue the creation of the tarball, and send an accepted response
- publish_archive_message(@repository, disk_path, @commit)
+ if !File.exist?(File.join(GitoriousConfig["archive_work_dir"], disk_path))
+ publish_archive_message(@repository, disk_path, @commit)
+ end
respond_to do |format|
format.html {
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 94a7a95..3b3439f 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -99,11 +99,13 @@ var Gitorious = {
height: "70px"
});
}
+
+ element.show();
+ element.innerHTML = '<p class="spin"><img src="/images/spinner.gif" /></p>'
// load the status
new Ajax.Request(url, {
onSuccess: function(transport) {
$(container).update(transport.responseText);
- $(container).show();
}
});
return false;