* Updated DB mappings of File/Files getting closer to the one of Image/Images
* 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:
parent
29ca787190
commit
9b4a5bc10e
17 changed files with 68 additions and 84 deletions
|
@ -525,9 +525,9 @@ Site.prototype.referrers_macro = function() {
|
|||
date.setDate(date.getDate() - 1);
|
||||
var db = getDBConnection("antville");
|
||||
var query = "select referrer, count(*) as requests from log " +
|
||||
"where action = 'main' and context_type = 'Site' and context_id = " +
|
||||
this._id + " and created > {ts '" + date.format("yyyy-MM-dd HH:mm:ss") +
|
||||
"'} group by referrer order by requests desc, referrer asc;";
|
||||
"where context_type = 'Site' and context_id = " + this._id +
|
||||
" and created > {ts '" + date.format("yyyy-MM-dd HH:mm:ss") +
|
||||
"'} and action = 'main' group by referrer order by requests desc, referrer asc;";
|
||||
var rows = db.executeRetrieval(query);
|
||||
var referrer;
|
||||
while (rows.next()) {
|
||||
|
|
|
@ -39,10 +39,11 @@ metadata_source = metadata
|
|||
archive = mountpoint(Archive)
|
||||
members = mountpoint(Members)
|
||||
images = mountpoint(Images)
|
||||
#layouts = mountpoint(Layouts)
|
||||
files = mountpoint(Files)
|
||||
stories = mountpoint(Stories)
|
||||
polls = mountpoint(Polls)
|
||||
tags = mountpoint(Tags)
|
||||
galleries = mountpoint(Tags)
|
||||
|
||||
creator = object(User)
|
||||
creator.local = creator_id
|
||||
|
@ -59,6 +60,3 @@ layout.foreign = id
|
|||
$tags = collection(Tag)
|
||||
$tags.local = id
|
||||
$tags.foreign = site_id
|
||||
|
||||
tags = mountpoint(Tags)
|
||||
galleries = mountpoint(Tags)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue