From 39a39df86ee08e170c56b5d45f1540d7c38fa759 Mon Sep 17 00:00:00 2001 From: Pepper Date: Mon, 7 Dec 2015 18:15:08 -0500 Subject: pushing newest db version --- photoblaster/db/models/__init__.py | 1 + share/frontend/im/img/38.png | Bin 0 -> 253 bytes share/frontend/im/index.html | 3 --- 3 files changed, 1 insertion(+), 3 deletions(-) create mode 100644 share/frontend/im/img/38.png diff --git a/photoblaster/db/models/__init__.py b/photoblaster/db/models/__init__.py index 5131c4d..f076c08 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): diff --git a/share/frontend/im/img/38.png b/share/frontend/im/img/38.png new file mode 100644 index 0000000..4ac8558 Binary files /dev/null and b/share/frontend/im/img/38.png differ 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 @@ -
- SORRY, this photoblaster page is down for maintenance. Will be back in an hour or so... -
-- cgit v1.2.3-70-g09d2 From 99ba124d646c431f14b5f6d1ce3aa5547680862d Mon Sep 17 00:00:00 2001 From: Pepper Date: Mon, 7 Dec 2015 18:17:05 -0500 Subject: added extra session code to help with overloading --- photoblaster/db/models/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/photoblaster/db/models/__init__.py b/photoblaster/db/models/__init__.py index f076c08..f35a63f 100644 --- a/photoblaster/db/models/__init__.py +++ b/photoblaster/db/models/__init__.py @@ -26,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 @@ -41,5 +43,7 @@ class Actions(object): def query(cls, **kwargs): session = SessionHeap() query = session.query(cls) + session.commit() + session.close() SessionHeap.remove() return query -- cgit v1.2.3-70-g09d2 From fcd284359f98ad6a18107da9d5ae4fee0a70a9a7 Mon Sep 17 00:00:00 2001 From: Pepper Date: Mon, 7 Dec 2015 18:19:41 -0500 Subject: added warning about local version --- run_server.py | 6 ++++++ 1 file changed, 6 insertions(+) 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() -- cgit v1.2.3-70-g09d2 From 635283172e6af2d3dbaed099580971611bc01c80 Mon Sep 17 00:00:00 2001 From: Pepper Date: Mon, 7 Dec 2015 20:16:47 -0500 Subject: removed broken symlinks --- share/frontend/js/colordictbackup.js | 1 - share/frontend/js/imbreak-main.js | 1 - share/frontend/js/imgrid-main.js | 1 - share/frontend/js/jcookie.js | 1 - share/frontend/js/jquery.cookie.js | 1 - share/frontend/js/jquery.min.js | 1 - share/frontend/js/maincopy.js | 1 - share/frontend/js/popup.js | 1 - 8 files changed, 8 deletions(-) delete mode 120000 share/frontend/js/colordictbackup.js delete mode 120000 share/frontend/js/imbreak-main.js delete mode 120000 share/frontend/js/imgrid-main.js delete mode 120000 share/frontend/js/jcookie.js delete mode 120000 share/frontend/js/jquery.cookie.js delete mode 120000 share/frontend/js/jquery.min.js delete mode 120000 share/frontend/js/maincopy.js delete mode 120000 share/frontend/js/popup.js 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 -- cgit v1.2.3-70-g09d2