Merge branch 'release/1.9.17'

akvo · May 3, 2017 · c601390 · c601390
2 parents e9cbeb4 + af5625a
commit c601390
Show file tree

Hide file tree

Showing 36 changed files with 618 additions and 1,153 deletions.
diff --git a/.gitignore b/.gitignore
@@ -91,3 +91,8 @@ tests/clojure/akvo-tests/target
 *.codekit
 *.scssc
 dwsync.xml
+
+#IntelliJ
+out/
+.idea/
+*.iml
diff --git a/Dashboard/app/cljs/src/org/akvo/flow/dashboard/users/role_details.cljs b/Dashboard/app/cljs/src/org/akvo/flow/dashboard/users/role_details.cljs
@@ -32,6 +32,7 @@
    "FORM_READ" (t> _access_forms)
    "FORM_UPDATE" (t> _edit_forms)
    "FORM_DELETE" (t> _delete_forms)
+   "DATA_APPROVE_MANAGE" (t> _data_approval_manage)
    "DATA_CLEANING" (t> _data_cleaning)
    "DATA_READ" (t> _read_data)
    "DATA_UPDATE" (t> _edit_data)