diff options
| -rw-r--r-- | photoblaster/db/models/__init__.py | 5 | ||||
| -rw-r--r-- | run_server.py | 6 | ||||
| -rw-r--r-- | share/frontend/im/img/38.png | bin | 0 -> 253 bytes | |||
| -rwxr-xr-x | share/frontend/im/index.html | 3 | ||||
| l--------- | share/frontend/js/colordictbackup.js | 1 | ||||
| l--------- | share/frontend/js/imbreak-main.js | 1 | ||||
| l--------- | share/frontend/js/imgrid-main.js | 1 | ||||
| l--------- | share/frontend/js/jcookie.js | 1 | ||||
| l--------- | share/frontend/js/jquery.cookie.js | 1 | ||||
| l--------- | share/frontend/js/jquery.min.js | 1 | ||||
| l--------- | share/frontend/js/maincopy.js | 1 | ||||
| l--------- | share/frontend/js/popup.js | 1 |
12 files changed, 11 insertions, 11 deletions
diff --git a/photoblaster/db/models/__init__.py b/photoblaster/db/models/__init__.py index 5131c4d..f35a63f 100644 --- a/photoblaster/db/models/__init__.py +++ b/photoblaster/db/models/__init__.py @@ -13,6 +13,7 @@ class Actions(object): session = SessionHeap() session.add(cls(**kwargs)) session.commit() + session.close() SessionHeap.remove() def update(self, **kwargs): @@ -25,6 +26,8 @@ class Actions(object): def _search(cls, **kwargs): session = SessionHeap() query = session.query(cls).filter_by(**kwargs) + session.commit() + session.close() SessionHeap.remove() return query @@ -40,5 +43,7 @@ class Actions(object): def query(cls, **kwargs): session = SessionHeap() query = session.query(cls) + session.commit() + session.close() SessionHeap.remove() return query diff --git a/run_server.py b/run_server.py index 0dd92f6..63b932c 100644 --- a/run_server.py +++ b/run_server.py @@ -9,6 +9,12 @@ server = Server() if __name__ == "__main__": if LOCAL: + sys.stderr.write( + "RUNNING LOCAL VERSION OF SERVER\n" + "TO RUN PRODUCTION VERSION SET ENVIRONMENT VARIABLE" + "PB_PRODUCTION=1...ie\n" + "$>export PB_PRODUCTION=1" + ) server.run() else: server.run_wsgi() diff --git a/share/frontend/im/img/38.png b/share/frontend/im/img/38.png Binary files differnew file mode 100644 index 0000000..4ac8558 --- /dev/null +++ b/share/frontend/im/img/38.png diff --git a/share/frontend/im/index.html b/share/frontend/im/index.html index 313fe04..d14cf9e 100755 --- a/share/frontend/im/index.html +++ b/share/frontend/im/index.html @@ -17,9 +17,6 @@ </head> <body> -<div id="down_for_maintenance"> - <span>SORRY, this photoblaster page is down for maintenance. Will be back in an hour or so...</span> -</div> <div id="controls"> <form id="imform" action="javascript:return false"> <label id="img-url-label">IMAGE URL</label> diff --git a/share/frontend/js/colordictbackup.js b/share/frontend/js/colordictbackup.js deleted file mode 120000 index 6e9d202..0000000 --- a/share/frontend/js/colordictbackup.js +++ /dev/null @@ -1 +0,0 @@ -../imgrid/js/colordictbackup.js
\ No newline at end of file diff --git a/share/frontend/js/imbreak-main.js b/share/frontend/js/imbreak-main.js deleted file mode 120000 index 24bd38f..0000000 --- a/share/frontend/js/imbreak-main.js +++ /dev/null @@ -1 +0,0 @@ -../imbreak/js/imbreak-main.js
\ No newline at end of file diff --git a/share/frontend/js/imgrid-main.js b/share/frontend/js/imgrid-main.js deleted file mode 120000 index d555578..0000000 --- a/share/frontend/js/imgrid-main.js +++ /dev/null @@ -1 +0,0 @@ -../imgrid/js/imgrid-main.js
\ No newline at end of file diff --git a/share/frontend/js/jcookie.js b/share/frontend/js/jcookie.js deleted file mode 120000 index 9ea53e1..0000000 --- a/share/frontend/js/jcookie.js +++ /dev/null @@ -1 +0,0 @@ -../imbreak/js/jcookie.js
\ No newline at end of file diff --git a/share/frontend/js/jquery.cookie.js b/share/frontend/js/jquery.cookie.js deleted file mode 120000 index 63f5c56..0000000 --- a/share/frontend/js/jquery.cookie.js +++ /dev/null @@ -1 +0,0 @@ -../imbreak/js/jquery.cookie.js
\ No newline at end of file diff --git a/share/frontend/js/jquery.min.js b/share/frontend/js/jquery.min.js deleted file mode 120000 index 0413a58..0000000 --- a/share/frontend/js/jquery.min.js +++ /dev/null @@ -1 +0,0 @@ -../imbreak/js/jquery.min.js
\ No newline at end of file diff --git a/share/frontend/js/maincopy.js b/share/frontend/js/maincopy.js deleted file mode 120000 index 317b9cd..0000000 --- a/share/frontend/js/maincopy.js +++ /dev/null @@ -1 +0,0 @@ -../imgrid/js/maincopy.js
\ No newline at end of file diff --git a/share/frontend/js/popup.js b/share/frontend/js/popup.js deleted file mode 120000 index 7b52e23..0000000 --- a/share/frontend/js/popup.js +++ /dev/null @@ -1 +0,0 @@ -../imgrid/js/popup.js
\ No newline at end of file |
