summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorhukl <contact@smyck.org>2011-02-10 14:20:21 +0100
committerhukl <contact@smyck.org>2011-02-10 14:20:21 +0100
commitcec2b1e2881db0000b2a09029154bea0fc62ade3 (patch)
treecf743f377d3e2e28a31ae0359d95f37beba82cc3 /app
parent65276f391645b6f7c786cb7a4b1161b3560a0d6d (diff)
parent94b2fcc5562014915db16b5ca5767865ef8f60a3 (diff)
Merge branch 'master' of github.com:hukl/cccms
Diffstat (limited to 'app')
-rw-r--r--app/controllers/admin_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 57f0d77..1d1a1ca 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -14,7 +14,7 @@ class AdminController < ApplicationController
14 :limit => 20, 14 :limit => 20,
15 :order => "updated_at desc", 15 :order => "updated_at desc",
16 :conditions => [ 16 :conditions => [
17 "updated_at < ? AND updated_at > ?", Time.now, Time.now-14.days 17 "updated_at < ? AND updated_at > ? AND parent_id IS NOT NULL", Time.now, Time.now-14.days
18 ] 18 ]
19 ) 19 )
20 end 20 end