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

* Updated DB mappings of File/Files getting closer to the one of Image/Images

Browse source 
* Disabled ip address property in LogEntry (will be removed in the long run)
 * Removed custom property from Skin (still needs some care)
 * Removed commented code
This commit is contained in:
Tobi Schäfer 2008-04-16 23:11:47 +00:00
parent 29ca787190
commit 9b4a5bc10e
17 changed files with 68 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

24
code/Admin/Admin.js
View file

@ -270,15 +270,22 @@ Admin.prototype.moduleSetup_macro = function(param) {
Admin.prototype.filterLog = function(data) {
data || (data = {});
var sql = "where action <> 'main' ";
switch (data.filter) {
case "1":
sql += "and context_type = 'Site' "; break;
case "2":
sql += "and context_type = 'User' "; break;
case "3":
sql += "and context_type = 'Root' "; break;
var sql = "";
if (data.filter > 0) {
sql += "where context_type = '";
switch (data.filter) {
case "1":
sql += "Site"; break;
case "2":
sql += "User"; break;
case "3":
sql += "Root"; break;
}
sql += "' and ";
} else {
sql += "where "
}
sql += "action <> 'main' ";
if (data.query) {
var parts = stripTags(data.query).split(" ");
var keyword, like;
@ -291,6 +298,7 @@ Admin.prototype.filterLog = function(data) {
}
sql += "order by created ";
(data.dir == 1) || (sql += "desc");
res.debug(sql)
this.log.subnodeRelation = sql;
return;
};