External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 17:37:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts.

Browse Source
This commit is contained in:
Michael DeHaan
2013-04-17 20:35:01 -04:00
parent 7c5fcba037
commit 5336316f2e
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/main/views.py
View File

@@ -43,6 +43,7 @@ class OrganizationsList(BaseList):
model = Organization model = Organization
serializer_class = OrganizationSerializer serializer_class = OrganizationSerializer
permission_classes = (CustomRbac,) permission_classes = (CustomRbac,)
filter_fields = ('name',)
# I can see the organizations if: # I can see the organizations if:
# I am a superuser # I am a superuser

9
lib/settings/defaults.py
View File

@@ -1,16 +1,16 @@
# Copyright (c) 2013 AnsibleWorks, Inc. # Copyright (c) 2013 AnsibleWorks, Inc.
# #
# This file is part of Ansible Commander. # This file is part of Ansible Commander.
# #
# Ansible Commander is free software: you can redistribute it and/or modify # 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 # 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, # Ansible Commander is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with Ansible Commander. If not, see <http://www.gnu.org/licenses/>. # along with Ansible Commander. If not, see <http://www.gnu.org/licenses/>.
@@ -38,7 +38,8 @@ ADMINS = (
MANAGERS = ADMINS MANAGERS = ADMINS
REST_FRAMEWORK = { REST_FRAMEWORK = {
'PAGINATE_BY': 10, 'FILTER_BACKEND': 'rest_framework.filters.DjangoFilterBackend',
'PAGINATE_BY': 25,
'PAGINATE_BY_PARAM': 'page_size', 'PAGINATE_BY_PARAM': 'page_size',
'DEFAULT_AUTHENTICATION_CLASSES': ( 'DEFAULT_AUTHENTICATION_CLASSES': (
'rest_framework.authentication.BasicAuthentication', 'rest_framework.authentication.BasicAuthentication',