Skip to content

Commit

Permalink
Merge pull request sshwsfc#83 from thaxter/spelling-fixes
Browse files Browse the repository at this point in the history
Spelling fixes
  • Loading branch information
sshwsfc committed Nov 15, 2013
2 parents 72a1478 + 6f90efa commit 3cd17ef
Show file tree
Hide file tree
Showing 19 changed files with 856 additions and 855 deletions.
8 changes: 4 additions & 4 deletions demo_app/app/adminx.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ class BaseSetting(object):


class GolbeSetting(object):
globe_search_models = [Host, IDC]
globe_models_icon = {
global_search_models = [Host, IDC]
global_models_icon = {
Host: 'laptop', IDC: 'cloud'
}
xadmin.site.register(views.CommAdminView, GolbeSetting)
Expand Down Expand Up @@ -89,14 +89,14 @@ def open_web(self, instance):
form_layout = (
Main(
TabHolder(
Tab('Comm Fiels',
Tab('Comm Fields',
Fieldset('Company data',
'name', 'idc',
description="some comm fields, required"
),
Inline(MaintainLog),
),
Tab('Extend Fiedls',
Tab('Extend Fields',
Fieldset('Contact details',
'service_type',
Row('brand', 'model'),
Expand Down
2 changes: 1 addition & 1 deletion demo_app/demo/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
xadmin.autodiscover()

# from xadmin.plugins import xversion
# xversion.registe_models()
# xversion.register_models()

urlpatterns = patterns('',
url(r'', include(xadmin.site.urls)),
Expand Down
4 changes: 2 additions & 2 deletions tests/xtests/view_base/adminx.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class TestBaseView(BaseAdminView):
pass

class TestCommView(CommAdminView):
globe_models_icon = {ModelB: 'test'}
global_models_icon = {ModelB: 'test'}

class TestAView(BaseAdminView):
pass
Expand All @@ -27,4 +27,4 @@ class OptionA(object):
site.register_view(r"^test/a$", TestAView, 'test_a')

site.register(ModelA, ModelAAdmin)
site.register(ModelB)
site.register(ModelB)
Loading

0 comments on commit 3cd17ef

Please sign in to comment.