Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: removed proxies persistency flag #754

Merged
merged 1 commit into from
Feb 7, 2024
Merged

feat: removed proxies persistency flag #754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions src/WebAppDIRAC/WebApp/handler/ProxyManagerHandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,12 @@ def web_getProxyManagerData(
sortField="UserName",
username="[]",
usergroup="[]",
persistent="",
expiredBefore=0,
expiredAfter=0,
):
if self.getUserName().lower() == "anonymous":
return {"success": "false", "error": "You are not authorize to access these data"}
req = self.__prepareParameters(username, usergroup, persistent, expiredBefore, expiredAfter)
req = self.__prepareParameters(username, usergroup, expiredBefore, expiredAfter)
gLogger.info("!!! S O R T : ", sort := [[sortField, sortDirection]])
# pylint: disable=no-member
result = gProxyManager.getDBContents(req, sort, start, limit)
Expand All @@ -89,7 +88,6 @@ def web_getProxyManagerData(
"UserDN": record[1],
"UserGroup": record[2],
"ExpirationTime": str(record[3]),
"PersistentFlag": str(record[4]),
}
)
timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M [UTC]")
Expand Down Expand Up @@ -147,14 +145,13 @@ def __humanize_time(self, sec=False):
elif day > 0:
return f"{day} days"

def __prepareParameters(self, username, usergroup, persistent, expiredBefore, expiredAfter):
def __prepareParameters(self, username, usergroup, expiredBefore, expiredAfter):
req = {}
if users := list(json.loads(username)):
req["UserName"] = users
if usersgroup := list(json.loads(usergroup)):
req["UserGroup"] = usersgroup
if usersgroup and persistent in ["True", "False"]:
req["PersistentFlag"] = persistent

if expiredBefore > expiredAfter:
expiredBefore, expiredAfter = expiredAfter, expiredBefore
if expiredBefore:
Expand Down
10 changes: 0 additions & 10 deletions src/WebAppDIRAC/WebApp/static/DIRAC/ProxyManager/classes/ProxyManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,6 @@ Ext.define("DIRAC.ProxyManager.classes.ProxyManager", {
type: "date",
dateFormat: "Y-m-d H:i:s",
},
{
name: "PersistentFlag",
},
],

initComponent: function () {
Expand Down Expand Up @@ -197,13 +194,6 @@ Ext.define("DIRAC.ProxyManager.classes.ProxyManager", {
}
},
},
Persistent: {
dataIndex: "PersistentFlag",
properties: {
width: 100,
sortable: true,
},
},
};

me.grid = Ext.create("Ext.dirac.utils.DiracGridPanel", {
Expand Down
Loading