antville/antville
antville/antville
1
1
Fork 0
Code Issues 51 Pull requests 8 Projects Releases 9 Wiki Activity Actions

- searching now also works if user presses the enter-key in form (instead of having to click on button)

Browse source 
- renamed res.data.searchform to res.data.body and res.data.body to res.data.list
This commit is contained in:
Robert Gaggl 2003-03-03 12:24:45 +00:00
parent 6a92b2678b
commit ea18e39f17
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/SysMgr/logs.hac
View file

@ -1,14 +1,14 @@
res.data.title = root.getSysTitle() + " Manager - " + req.action; res.data.title = root.getSysTitle() + " Manager - " + req.action;
res.data.action = this.href(req.action); res.data.action = this.href(req.action);
if (req.data.search) if (req.data.search || req.data.keywords)
session.data.mgr.searchSyslog(req.data.show,req.data.order,req.data.keywords); session.data.mgr.searchSyslog(req.data.show,req.data.order,req.data.keywords);
session.data.mgr.renderPageNavigation("syslogs",this.href(req.action),parseInt(req.data.page,10)); session.data.mgr.renderPageNavigation("syslogs",this.href(req.action),parseInt(req.data.page,10));
session.data.mgr.renderList("syslogs",null,null,parseInt(req.data.page,10)); session.data.mgr.renderList("syslogs",null,null,parseInt(req.data.page,10));
res.data.searchform = this.renderSkinAsString("syslogsearchform"); res.data.body = this.renderSkinAsString("syslogsearchform");
res.data.body = this.renderSkinAsString("list"); res.data.list = this.renderSkinAsString("list");
this.renderSkin("page"); this.renderSkin("page");

7
code/SysMgr/sites.hac
View file

@ -1,7 +1,6 @@
res.data.title = root.getSysTitle() + " Manager - " + req.action; res.data.title = root.getSysTitle() + " Manager - " + req.action;
res.data.action = this.href(req.action); res.data.action = this.href(req.action);
if (req.data.search || req.data.keywords)
if (req.data.search)
session.data.mgr.searchSites(req.data.show, req.data.sort, req.data.order, req.data.keywords); session.data.mgr.searchSites(req.data.show, req.data.sort, req.data.order, req.data.keywords);
else if (req.data.cancel) else if (req.data.cancel)
res.redirect(res.data.action + "?page=" + req.data.page + "#" + req.data.item); res.redirect(res.data.action + "?page=" + req.data.page + "#" + req.data.item);
@ -23,8 +22,8 @@ else if (req.data.remove && req.data.item) {
session.data.mgr.renderPageNavigation("sites", res.data.action, parseInt(req.data.page, 10)); session.data.mgr.renderPageNavigation("sites", res.data.action, parseInt(req.data.page, 10));
session.data.mgr.renderList("sites", root.get(req.data.item), req.data.action, parseInt(req.data.page, 10)); session.data.mgr.renderList("sites", root.get(req.data.item), req.data.action, parseInt(req.data.page, 10));
res.data.searchform = this.renderSkinAsString("sitesearchform"); res.data.body = this.renderSkinAsString("sitesearchform");
res.data.body = this.renderSkinAsString("list"); res.data.list = this.renderSkinAsString("list");
this.renderSkin("page"); this.renderSkin("page");

6
code/SysMgr/users.hac
View file

@ -1,7 +1,7 @@
res.data.title = root.getSysTitle() + " Manager - " + req.action; res.data.title = root.getSysTitle() + " Manager - " + req.action;
res.data.action = this.href(req.action); res.data.action = this.href(req.action);
if (req.data.search) if (req.data.search || req.data.keywords)
session.data.mgr.searchUsers(req.data.show, req.data.sort, req.data.order, req.data.keywords); session.data.mgr.searchUsers(req.data.show, req.data.sort, req.data.order, req.data.keywords);
else if (req.data.submit == "cancel" || req.data.cancel) else if (req.data.submit == "cancel" || req.data.cancel)
res.redirect(res.data.action + "?page=" + req.data.page + "#" + req.data.item); res.redirect(res.data.action + "?page=" + req.data.page + "#" + req.data.item);
@ -12,10 +12,10 @@ else if (req.data.submit == "save" || req.data.save) {
res.redirect(res.data.action + "?page=" + req.data.page + "#" + req.data.item); res.redirect(res.data.action + "?page=" + req.data.page + "#" + req.data.item);
} }
res.data.searchform = this.renderSkinAsString("usersearchform"); res.data.body = this.renderSkinAsString("usersearchform");
session.data.mgr.renderPageNavigation("users",res.data.action,parseInt(req.data.page,10)); session.data.mgr.renderPageNavigation("users",res.data.action,parseInt(req.data.page,10));
session.data.mgr.renderList("users",root.users.get(req.data.item),req.data.action,parseInt(req.data.page,10)); session.data.mgr.renderList("users",root.users.get(req.data.item),req.data.action,parseInt(req.data.page,10));
res.data.body = this.renderSkinAsString("list"); res.data.list = this.renderSkinAsString("list");
this.renderSkin("page"); this.renderSkin("page");