Merge branch 'master' into rest-enhancements-2

qedsoftware · Dec 10, 2018 · 252a239 · 252a239
2 parents 316de36 + ccd0689
commit 252a239
Show file tree

Hide file tree

Showing 66 changed files with 1,041 additions and 860 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -3,7 +3,7 @@
 1. [ ] If you've added code that should be tested, add tests
 2. [ ] If you've changed APIs, update (or create!) the documentation
 3. [ ] Ensure the tests pass
-4. [ ] Make sure your code lints and you followed [our coding style](../CONTRIBUTING.md)
+4. [ ] Make sure your code lints and you followed [our coding style](https://github.com/kobotoolbox/kpi/blob/master/CONTRIBUTING.md)
 5. [ ] If this is a big feature, make sure to prefix the title with `Feature:` and add a thorough description for non-dev folk
 
 ## Description

diff --git a/dependencies/pip/dev_requirements.txt b/dependencies/pip/dev_requirements.txt
@@ -5,7 +5,7 @@
 #    pip-compile --output-file dependencies/pip/dev_requirements.txt dependencies/pip/dev_requirements.in
 #
 -e git+https://github.com/dimagi/django-digest@0eb1c921329dd187c343b61acfbec4e98450136e#egg=django_digest
--e git+https://github.com/kobotoolbox/formpack.git@c94751b25f315e15db6d32fa2ebf816263cb6c56#egg=formpack
+-e git+https://github.com/kobotoolbox/formpack.git@40110eeb001b1a581aad6836f746fedef8be5752#egg=formpack
 amqp==2.1.4
 anyjson==0.3.3
 argparse==1.4.0           # via unittest2

diff --git a/dependencies/pip/external_services.txt b/dependencies/pip/external_services.txt
@@ -5,7 +5,7 @@
 #    pip-compile --output-file dependencies/pip/external_services.txt dependencies/pip/external_services.in
 #
 -e git+https://github.com/dimagi/django-digest@0eb1c921329dd187c343b61acfbec4e98450136e#egg=django_digest
--e git+https://github.com/kobotoolbox/formpack.git@c94751b25f315e15db6d32fa2ebf816263cb6c56#egg=formpack
+-e git+https://github.com/kobotoolbox/formpack.git@40110eeb001b1a581aad6836f746fedef8be5752#egg=formpack
 amqp==2.3.2
 anyjson==0.3.3
 argparse==1.4.0           # via unittest2

diff --git a/dependencies/pip/requirements.in b/dependencies/pip/requirements.in
@@ -2,7 +2,7 @@
 # https://github.com/bndr/pipreqs is a handy utility, too.
 
 # Formpack
--e git+https://github.com/kobotoolbox/formpack.git@c94751b25f315e15db6d32fa2ebf816263cb6c56#egg=formpack
+-e git+https://github.com/kobotoolbox/formpack.git@40110eeb001b1a581aad6836f746fedef8be5752#egg=formpack
 
 # More up-to-date version of django-digest than PyPI seems to have.
 # Also, python-digest is an unlisted dependency thereof.

diff --git a/dependencies/pip/requirements.txt b/dependencies/pip/requirements.txt
@@ -2,10 +2,10 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --output-file requirements.txt requirements.in
+#    pip-compile --output-file dependencies/pip/requirements.txt dependencies/pip/requirements.in
 #
 -e git+https://github.com/dimagi/django-digest@0eb1c921329dd187c343b61acfbec4e98450136e#egg=django_digest
--e git+https://github.com/kobotoolbox/formpack.git@c94751b25f315e15db6d32fa2ebf816263cb6c56#egg=formpack
+-e git+https://github.com/kobotoolbox/formpack.git@40110eeb001b1a581aad6836f746fedef8be5752#egg=formpack
 amqp==2.3.2
 anyjson==0.3.3
 argparse==1.4.0           # via unittest2

diff --git a/fabfile/__init__.py b/fabfile/__init__.py
diff --git a/fabfile/docker.py b/fabfile/docker.py
diff --git a/jsapp/js/actions.es6 b/jsapp/js/actions.es6
@@ -582,6 +582,9 @@ actions.permissions.assignPerm.listen(function(creds){
 actions.permissions.assignPerm.completed.listen(function(val){
   actions.resources.loadAsset({url: val.content_object});
 });
+actions.permissions.assignPerm.failed.listen(function(){
+  notify(t('failed to update permissions'), 'error');
+});
 
 // copies permissions from one asset to other
 actions.permissions.copyPermissionsFrom.listen(function(sourceUid, targetUid) {
@@ -607,6 +610,9 @@ actions.permissions.removePerm.listen(function(details){
 actions.permissions.removePerm.completed.listen(function(uid){
   actions.resources.loadAsset({id: uid});
 });
+actions.permissions.removePerm.failed.listen(function(){
+  notify(t('failed to remove permissions'), 'error');
+});
 
 actions.permissions.setCollectionDiscoverability.listen(function(uid, discoverable){
   dataInterface.patchCollection(uid, {discoverable_when_public: discoverable})

diff --git a/jsapp/js/bem.es6 b/jsapp/js/bem.es6
@@ -256,7 +256,7 @@ bem.Checkbox__input = bem.Checkbox.__('input', '<input>');
 bem.Checkbox__label = bem.Checkbox.__('label', '<span>');
 
 bem.Radio = bem('radio');
-bem.Radio__wrapper = bem.Radio.__('wrapper', '<label>');
+bem.Radio__row = bem.Radio.__('row', '<label>');
 bem.Radio__input = bem.Radio.__('input', '<input>');
 bem.Radio__label = bem.Radio.__('label', '<span>');