Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ranger
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/804e6663 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/804e6663 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/804e6663 Branch: refs/heads/tag-policy Commit: 804e666340f69a3dc9643943aba847c14de85b4a Parents: b84b391 7ed35a9 Author: sneethiraj <[email protected]> Authored: Mon May 18 20:29:50 2015 -0400 Committer: sneethiraj <[email protected]> Committed: Mon May 18 20:29:50 2015 -0400 ---------------------------------------------------------------------- .../db/mysql/patches/013-permissionmodel.sql | 2 +- .../db/oracle/patches/013-permissionmodel.sql | 6 +- .../db/postgres/xa_core_db_postgres.sql | 6 +- .../db/sqlserver/xa_core_db_sqlserver.sql | 6 +- .../java/org/apache/ranger/biz/XUserMgr.java | 17 +++--- .../apache/ranger/common/RangerConstants.java | 6 +- .../webapp/scripts/controllers/Controller.js | 59 ++++++++----------- .../webapp/scripts/models/RangerServiceDef.js | 2 +- .../src/main/webapp/scripts/modules/XALinks.js | 16 ++--- .../main/webapp/scripts/modules/XAOverrides.js | 2 +- .../scripts/modules/globalize/message/en.js | 9 ++- .../src/main/webapp/scripts/utils/XAEnums.js | 8 +++ .../src/main/webapp/scripts/utils/XAGlobals.js | 27 ++++----- .../src/main/webapp/scripts/utils/XAUtils.js | 54 ++++++++++++++--- .../main/webapp/scripts/views/common/TopNav.js | 25 ++++++++ .../views/permissions/ModulePermissionCreate.js | 30 ---------- .../webapp/scripts/views/reports/AuditLayout.js | 33 ++++------- security-admin/src/main/webapp/styles/xa.css | 4 ++ .../webapp/templates/common/TopNav_tmpl.html | 62 +++++++++++--------- .../reports/AssetOperationDiff_tmpl.html | 4 +- .../reports/AssetUpdateOperationDiff_tmpl.html | 2 +- .../templates/service/ServiceCreate_tmpl.html | 4 +- .../templates/service/ServiceForm_tmpl.html | 2 +- 23 files changed, 207 insertions(+), 179 deletions(-) ----------------------------------------------------------------------
