Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
commit ef36990f64f03dcd7f8e20f340c7adaafcd40a0d 2 parents afc1a7e + 83258a7
@ericrasmussen ericrasmussen authored
View
9 substanced/form/__init__.py
@@ -25,7 +25,7 @@
},
'jquery.form': {
None:{
- 'js':'deform:static/scripts/jquery.form.js',
+ 'js':'deform:static/scripts/jquery.form-3.09.js',
},
},
'jquery.maskedinput': {
@@ -33,6 +33,11 @@
'js':'deform:static/scripts/jquery.maskedinput-1.2.2.min.js',
},
},
+ 'jquery.maskMoney': {
+ None:{
+ 'js':'deform:static/scripts/jquery.maskMoney-1.4.1.js',
+ },
+ },
'datetimepicker': {
None:{
'js':'deform:static/scripts/jquery-ui-timepicker-addon.js',
@@ -41,7 +46,7 @@
},
'deform': {
None:{
- 'js':('deform:static/scripts/jquery.form.js',
+ 'js':('deform:static/scripts/jquery.form-3.09.js',
'deform:static/scripts/deform.js',
'deform_bootstrap:static/deform_bootstrap.js'),
'css':'deform:static/css/form.css',
View
2  substanced/principal/__init__.py
@@ -398,6 +398,8 @@ def commit_suicide(self):
def user_will_be_removed(user, event):
""" Remove all password reset objects associated with a user when the user
is removed """
+ if event.moving: # it's not really being removed
+ return
objectmap = find_service(user, 'objectmap')
if objectmap is not None:
resets = objectmap.targets(user, UserToPasswordReset)
View
10 substanced/principal/tests/test_principal.py
@@ -535,8 +535,16 @@ def commit_suicide():
parent['__services__'] = services
parent['user'] = user
services['objectmap'] = objectmap
- self._callFUT(user, None)
+ event = testing.DummyResource()
+ event.moving = False
+ self._callFUT(user, event)
self.assertTrue(reset.committed)
+
+ def test_it_moving(self):
+ user = None
+ event = testing.DummyResource()
+ event.moving = True
+ self.assertEqual(None, self._callFUT(user, event))
from ...interfaces import IFolder
Please sign in to comment.
Something went wrong with that request. Please try again.