summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Peck <bpeck@redhat.com>2009-05-14 16:24:11 -0400
committerBill Peck <bpeck@redhat.com>2009-05-14 16:24:11 -0400
commit4933c6b3dd89b10fa7a280501778a01da687da42 (patch)
tree81b56aa4a782ec8f4a34d038bb0b5aec06aa17d1
parent72eca6b077977c33e85e43baa8af67f45fe92f0d (diff)
workaround for broken paginate in fedorabeaker-0_3
-rw-r--r--Medusa/medusa/activity.py2
-rw-r--r--Medusa/medusa/controllers.py10
-rw-r--r--Medusa/medusa/distro.py2
-rw-r--r--Medusa/medusa/tag.py2
4 files changed, 8 insertions, 8 deletions
diff --git a/Medusa/medusa/activity.py b/Medusa/medusa/activity.py
index e9de066..bf7c124 100644
--- a/Medusa/medusa/activity.py
+++ b/Medusa/medusa/activity.py
@@ -24,7 +24,7 @@ class Activities(RPCRoot):
exposed = False
@expose(template="medusa.templates.grid")
- @paginate('list',default_order='-created', limit=50,allow_limit_override=True)
+ @paginate('list',default_order='-created', max_limit=50, limit=50,allow_limit_override=True)
def index(self):
activity = Activity.all().outerjoin('user')
activity_grid = widgets.PaginateDataGrid(fields=[
diff --git a/Medusa/medusa/controllers.py b/Medusa/medusa/controllers.py
index c9a2839..3e30059 100644
--- a/Medusa/medusa/controllers.py
+++ b/Medusa/medusa/controllers.py
@@ -149,7 +149,7 @@ class Devices:
list = systems)
@expose(template='medusa.templates.grid')
- @paginate('list',default_order='description',limit=50,allow_limit_override=True)
+ @paginate('list',default_order='description',limit=50,max_limit=50,allow_limit_override=True)
def default(self, *args, **kw):
args = list(args)
if len(args) == 1:
@@ -256,7 +256,7 @@ class Root(RPCRoot):
kernel_options_post = kernel_options_post)
@expose(template='medusa.templates.grid_add')
- @paginate('list',default_order='fqdn',limit=20,allow_limit_override=True)
+ @paginate('list',default_order='fqdn',limit=20,max_limit=20,allow_limit_override=True)
def index(self, *args, **kw):
return self.systems(systems = System.all(identity.current.user), *args, **kw)
@@ -284,19 +284,19 @@ class Root(RPCRoot):
@expose(template='medusa.templates.grid')
@identity.require(identity.not_anonymous())
- @paginate('list',default_order='fqdn',limit=20,allow_limit_override=True)
+ @paginate('list',default_order='fqdn',limit=20,max_limit=20,allow_limit_override=True)
def available(self, *args, **kw):
return self.systems(systems = System.available(identity.current.user), *args, **kw)
@expose(template='medusa.templates.grid')
@identity.require(identity.not_anonymous())
- @paginate('list',default_order='fqdn',limit=20,allow_limit_override=True)
+ @paginate('list',default_order='fqdn',limit=20,max_limit=20,allow_limit_override=True)
def free(self, *args, **kw):
return self.systems(systems = System.free(identity.current.user), *args, **kw)
@expose(template='medusa.templates.grid')
@identity.require(identity.not_anonymous())
- @paginate('list',default_order='fqdn',limit=20,allow_limit_override=True)
+ @paginate('list',default_order='fqdn',limit=20,max_limit=20,allow_limit_override=True)
def mine(self, *args, **kw):
return self.systems(systems = System.mine(identity.current.user), *args, **kw)
diff --git a/Medusa/medusa/distro.py b/Medusa/medusa/distro.py
index 7f2060c..4a2daeb 100644
--- a/Medusa/medusa/distro.py
+++ b/Medusa/medusa/distro.py
@@ -70,7 +70,7 @@ class Distros(RPCRoot):
redirect("./view?id=%s" % id)
@expose(template="medusa.templates.grid")
- @paginate('list',default_order='-date_created', limit=50,allow_limit_override=True)
+ @paginate('list',default_order='-date_created', max_limit=50, limit=50,allow_limit_override=True)
def index(self, *args, **kw):
distros = session.query(Distro).join('breed').join('arch').join(['osversion','osmajor'])
if 'tag' in kw:
diff --git a/Medusa/medusa/tag.py b/Medusa/medusa/tag.py
index 30b22c8..f797f22 100644
--- a/Medusa/medusa/tag.py
+++ b/Medusa/medusa/tag.py
@@ -35,7 +35,7 @@ class Tags(RPCRoot):
return dict(tags=tags)
@expose(template="medusa.templates.grid")
- @paginate('list',default_order='tag', limit=50,allow_limit_override=True)
+ @paginate('list',default_order='tag', max_limit=50,limit=50,allow_limit_override=True)
def index(self):
tags = session.query(DistroTag)
tags_grid = widgets.PaginateDataGrid(fields=[