dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed issue 1686:admin editor files menu hidden when codemirror is in fullscreen mode, thanks Paolo Caruccio

Browse Source
This commit is contained in:
mdipierro
2013-09-20 20:57:29 -05:00
parent f78e172eda 3d01a83c85
commit 9ea82fdaaf
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.6.3-stable+timestamp.2013.09.20.12.45.53 Version 2.6.3-stable+timestamp.2013.09.20.20.56.30
applications/admin/static/css/web2py-codemirror.css
+1 -1
View File
@@ -4,7 +4,7 @@
position: absolute ! important; position: absolute ! important;
top: 0; left: 0; top: 0; left: 0;
width: 100% ! important; width: 100% ! important;
z-index: 9999; z-index: 1028;
} }
/* BREAKPOINTS */ /* BREAKPOINTS */
gluon/globals.py
+14 -6
View File
@@ -858,15 +858,23 @@ class Session(Storage):
else: else:
response.session_id = None response.session_id = None
response.session_new = True response.session_new = True
# if there is no session id yet, we'll need to create a
# new session
else:
response.session_new = True
# set the cookie now if you know the session_id so user can set # set the cookie now if you know the session_id so user can set
# cookie attributes in controllers/models # cookie attributes in controllers/models
# cookie will be reset later # cookie will be reset later
# yet cookie may be reset later # yet cookie may be reset later
if (isinstance(response.session_id,str) and # Removed comparison between old and new session ids - should send
response.session_id!=old_session_id): # the cookie all the time
if isinstance(response.session_id,str):
response.cookies[response.session_id_name] = response.session_id response.cookies[response.session_id_name] = response.session_id
response.cookies[response.session_id_name]['path'] = '/'
if cookie_expires:
response.cookies[response.session_id_name]['expires'] = \
cookie_expires.strftime(FMT)
session_pickled = cPickle.dumps(self) session_pickled = cPickle.dumps(self)
response.session_hash = hashlib.md5(session_pickled).hexdigest() response.session_hash = hashlib.md5(session_pickled).hexdigest()
@@ -1035,10 +1043,10 @@ class Session(Storage):
def _try_store_in_db(self, request, response): def _try_store_in_db(self, request, response):
# don't save if file-based sessions, # don't save if file-based sessions,
# no session id, or session being forgotten # no session id, or session being forgotten
# or no changes to session # or no changes to session (Unless the session is new)
if (not response.session_db_table or if (not response.session_db_table or
self._forget or self._unchanged(response)): self._forget or
(self._unchanged(response) and not response.session_new)):
if (not response.session_db_table and if (not response.session_db_table and
global_settings.db_sessions is not True and global_settings.db_sessions is not True and
response.session_masterapp in global_settings.db_sessions): response.session_masterapp in global_settings.db_sessions):