This is an automated email from the ASF dual-hosted git repository.
ni3galave pushed a commit to branch ranger-2.4
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/ranger-2.4 by this push:
new 4e9b33447 RANGER-3910 : API Documentation is broken for knox sso
4e9b33447 is described below
commit 4e9b3344709ff84b5aaa2f65881814056f87f4cb
Author: Dhaval.Rajpara <[email protected]>
AuthorDate: Tue Jan 31 12:48:31 2023 +0530
RANGER-3910 : API Documentation is broken for knox sso
---
docs/src/site/resources/{index.html => swagger.html} | 0
security-admin/src/main/webapp/scripts/views/common/ProfileBar.js | 6 ++++++
.../src/main/webapp/templates/common/ProfileBar_tmpl.html | 2 +-
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/docs/src/site/resources/index.html
b/docs/src/site/resources/swagger.html
similarity index 100%
rename from docs/src/site/resources/index.html
rename to docs/src/site/resources/swagger.html
diff --git a/security-admin/src/main/webapp/scripts/views/common/ProfileBar.js
b/security-admin/src/main/webapp/scripts/views/common/ProfileBar.js
index d4ca108b9..87e4dca27 100644
--- a/security-admin/src/main/webapp/scripts/views/common/ProfileBar.js
+++ b/security-admin/src/main/webapp/scripts/views/common/ProfileBar.js
@@ -26,6 +26,7 @@ define(function(require){
var Communicator = require('communicator');
var SessionMgr = require('mgrs/SessionMgr');
var vError = require('views/common/ErrorView');
+ var XAUtil = require('utils/XAUtils');
var ProfileBar_tmpl = require('hbs!tmpl/common/ProfileBar_tmpl');
@@ -36,9 +37,14 @@ define(function(require){
template: ProfileBar_tmpl,
templateHelpers : function(){
+ var urlString = XAUtil.getBaseUrl();
+ if(urlString.slice(-1) == "/") {
+ urlString = urlString.slice(0,-1);
+ };
return {
userProfile : this.userProfile,
oldUi : localStorage.getItem('setOldUI') == "true" ?
false : true ,
+ swaggerUI : urlString+"/apidocs/swagger.html"
};
},
diff --git
a/security-admin/src/main/webapp/templates/common/ProfileBar_tmpl.html
b/security-admin/src/main/webapp/templates/common/ProfileBar_tmpl.html
index 049f472d0..d8c2112f1 100644
--- a/security-admin/src/main/webapp/templates/common/ProfileBar_tmpl.html
+++ b/security-admin/src/main/webapp/templates/common/ProfileBar_tmpl.html
@@ -22,7 +22,7 @@
</a>
<div class="dropdown-menu dropdown-menu-right">
<a class="dropdown-item" href="#!/userprofile"><i class="fa
fa-user m-r-xs"></i> Profile </a>
- <a class="dropdown-item" href="../../apidocs/index.html"
target='_blank'><i class="fa fa-user m-r-xs"></i> API Documentation </a>
+ <a class="dropdown-item" href={{swaggerUI}} target='_blank'><i
class="fa fa-user m-r-xs"></i> API Documentation </a>
<a class="dropdown-item" href="javascript:;" class="_allowNav"
data-id="logout"><i class="fa fa-power-off m-r-xs"></i> Log Out </a>
{{#if oldUi}}
<a class="dropdown-item" href="javascript:;"
data-id="oldNewSwitch" data-value="true">
