diff options
| author | Jules Laplace <julescarbon@gmail.com> | 2018-06-01 13:43:49 +0200 |
|---|---|---|
| committer | Jules Laplace <julescarbon@gmail.com> | 2018-06-01 13:43:49 +0200 |
| commit | 781afcfc9e71137cbc8cea492621eb44eeaa645b (patch) | |
| tree | 64929e1e1dea56885ac1a9491972364b94e24646 | |
| parent | 92735282cf92fbc31c7166b51247d7ec5888596b (diff) | |
| parent | 91948ccf90e5646ba630fafd631e95840bec9cf7 (diff) | |
merge
| -rw-r--r-- | photoblaster/config.py | 6 | ||||
| -rw-r--r-- | share/frontend/im/js/main.js | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/photoblaster/config.py b/photoblaster/config.py index 8a1f1a8..cf67328 100644 --- a/photoblaster/config.py +++ b/photoblaster/config.py @@ -4,9 +4,9 @@ if os.environ.get("PB_PRODUCTION"): LOCAL = False -MAX_SIZE = 1024 * 1024 * 1.2 * 1.5 +MAX_SIZE = 1024 * 1024 * 1.8 if LOCAL: - MAX_SIZE = 1024 * 1024 * 1.2 * 18 + MAX_SIZE = 1024 * 1024 * 21.6 # PATHS BIN_CONVERT = "/usr/bin/convert" @@ -69,7 +69,7 @@ SERVER_PORT = 8999 AWS_ACCESS_KEY_ID = 'AKIAIR53VPBXKJMXZIBA' AWS_SECRET_ACCESS_KEY = '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' BUCKET_NAME = 'i.asdf.us' -SPECIAL_DOWNLOADERS = ["ryz pepper RICHARD_GIOVANNI dmgk"] +SPECIAL_DOWNLOADERS = ["ryz pepper RICHARD_GIOVANNI dmgk kiny"] SPECIAL_DOWNLOADERS_MAX_SIZE = 1024 * 1024 * 10 diff --git a/share/frontend/im/js/main.js b/share/frontend/im/js/main.js index e1fa59e..3048096 100644 --- a/share/frontend/im/js/main.js +++ b/share/frontend/im/js/main.js @@ -56,7 +56,7 @@ window.Main = data: form, success: function(data){ Main.callback(data) }, error: function(data){ - console.log("in error") + console.log("error", data.status) switch(data.status){ case 500: Main.error("Problem with server") @@ -77,7 +77,8 @@ window.Main = error: function (s) { $("#result-rarr").hide() - $("#output-cmd").html("<span class='error'>ERROR: " + s + "</span>").show() + $("#output-cmd").html("<span class='error'>ERROR: " + s + "</span>") + $("#output-cmd").show() $("#output-url").hide() $("#output-img").hide() }, @@ -162,4 +163,5 @@ window.Main = }, } document.getElementById('imform').reset(); +document.getElementById('imform').addEventListener('submit', function(e){ e.preventDefault() }); Main.init () |