From 5336316f2ea4cff00966500f98c95738fdb60114 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <michael@ansibleworks.com>
Date: Wed, 17 Apr 2013 20:35:01 -0400
Subject: [PATCH] Resolve merge conflicts.

---
 lib/main/views.py        | 1 +
 lib/settings/defaults.py | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/main/views.py b/lib/main/views.py
index 44cc3be4c9..cdb6600cbc 100644
--- a/lib/main/views.py
+++ b/lib/main/views.py
@@ -43,6 +43,7 @@ class OrganizationsList(BaseList):
     model = Organization
     serializer_class = OrganizationSerializer
     permission_classes = (CustomRbac,)
+    filter_fields = ('name',)
 
     # I can see the organizations if:
     #   I am a superuser
diff --git a/lib/settings/defaults.py b/lib/settings/defaults.py
index 910ec9d51c..bcd0848124 100644
--- a/lib/settings/defaults.py
+++ b/lib/settings/defaults.py
@@ -1,16 +1,16 @@
 # Copyright (c) 2013 AnsibleWorks, Inc.
 #
 # This file is part of Ansible Commander.
-# 
+#
 # Ansible Commander is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, version 3 of the License. 
+# the Free Software Foundation, version 3 of the License.
 #
 # Ansible Commander is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with Ansible Commander. If not, see <http://www.gnu.org/licenses/>.
 
@@ -38,7 +38,8 @@ ADMINS = (
 MANAGERS = ADMINS
 
 REST_FRAMEWORK = {
-    'PAGINATE_BY': 10,
+    'FILTER_BACKEND': 'rest_framework.filters.DjangoFilterBackend',
+    'PAGINATE_BY': 25,
     'PAGINATE_BY_PARAM': 'page_size',
     'DEFAULT_AUTHENTICATION_CLASSES': (
         'rest_framework.authentication.BasicAuthentication',