Merge branch 'refs/heads/master' into docs-chinese

Conflicts:
	demo_app/data.db
	xadmin/plugins/__init__.py
	xadmin/sites.py
	xadmin/views/base.py
	xadmin/views/detail.py
	xadmin/views/edit.py
	xadmin/views/list.py

Author: sshwsfc

.gitignore

@@ -41,6 +41,8 @@ nosetests.xml
 
 _build
 xadmin/static/xadmin/components/
+xadmin/static/xadmin/bower_components/
 
 .idea
 *~
+demo_app/data.db

README.rst

@@ -72,15 +72,18 @@ Install Requires
 
 -  `django-crispy-forms`_ >=1.2.3 (For xadmin crispy forms)
 
--  `django-reversion`_ (For object history and reversion feature, please select right version by your django, see `changelog`_ )
+-  `django-reversion`_ ([OPTION] For object history and reversion feature, please select right version by your django, see `changelog`_ )
 
--  `xlwt`_ (For export xls files, option)
+-  `xlwt`_ ([OPTION] For export xls files)
+
+-  `xlsxwriter`_ ([OPTION] For export xlsx files)
 
 .. _django: http://djangoproject.com
 .. _django-crispy-forms: http://django-crispy-forms.rtfd.org
 .. _django-reversion: https://github.com/etianen/django-reversion
 .. _changelog: https://github.com/etianen/django-reversion/blob/master/CHANGELOG.markdown
 .. _xlwt: http://www.python-excel.org/
+.. _xlsxwriter: https://github.com/jmcnamara/XlsxWriter
 
 Documentation
 -------------
@@ -90,6 +93,27 @@ Documentation
 
 .. _Chinese: https://xadmin.readthedocs.org/en/latest/index.html
 
+Changelogs
+-------------
+
+0.5.0
+^^^^^
+    
+- Update fontawesome to 4.0.3
+- Update javascript files to compact fa icons new version
+- Update tests for the new instance method of the AdminSite class
+- Added demo graphs
+- Added quickfilter plugin.
+- Adding apps_icons with same logic of apps_label_title.
+- Add xlsxwriter for big data export.
+- Upgrade reversion models admin list page.
+- Fixed reverse many 2 many lookup giving FieldDoesNotExist error.
+- Fixed user permission check in inline model.
+
+`Detail`_
+
+.. _Detail: ./changelog.md
+
 Online Group
 ------------
 

changelog.md

@@ -0,0 +1,51 @@
+
+*0.5.0*
+---
+    
+- 2014-05-05 (sshwsfc) Update pump to version 0.5.0 -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/edcfde154d35d8aca9cd50486d940f68b0d62adc)
+- 2014-05-05 (sshwsfc) Fixed #120 change "datas" to "data". -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/8b9512448be5868c78672b9ef934a7cd049de552)
+- 2014-04-30 (paul) add support for url name in qbutton: if the string is a name of url, use reverse(url) else, use the url -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/0ceccb87deea5dcb14af8ffbab56dbad95d65d44)
+- 2014-04-29 (paul) Use methode(self, obj) in InlineModelAdmin for use in readonly_fields. see https://docs.djangoproject.com/en/1.6/ref/contrib/admin/#django.contrib.admin.ModelAdmin.readonly_fields """ A read-only field can not only display data from a model’s field, it can also display the output of a model’s method or a method of the ModelAdmin class itself. """ -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/1b86d15fc69534bc5a883019d6c964a2bd4c48b8)
+- 2014-04-17 (Andre Duarte) Adding apps_icons with same logic of apps_label_title -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/81e049f2d5cf64464f66d7ca943fb8758382c30a)
+- 2014-04-16 (cgcgbcbc) fix:global_(search/add)_models overriding -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/d50eea07f6f61ff4fdcfcbcb146a6c3452a79055)
+- 2014-04-10 (Jairus Martin) Added quickfilter plugin. Only made for in default menu style -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/5270606dc7fb8de99ab0eee59e59bcea65f3adea)
+- 2014-04-07 (Michał Szpadzik) Fixed user permission check in inline model, where only people who have 'add_permission' perm, should have '+' icon to add new elements. It's fix for #142 from main django-xadmin project. -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/a49214b48f194b3f4270e2650576f8cf14b8c2f7)
+- 2014-03-26 (Jairus Martin) Fixed it so you can display fields not in base_list_display -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/6c0f854a31be74320ce6f35d1bb51d453b53adf1)
+- 2014-03-26 (Jairus Martin) Made it make a copy if the data is not mutable -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/a0e268942bd0b1592d6b3917918353a39ae55ebb)
+- 2014-03-26 (Jairus Martin) Added ability to select specific fields -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/3a4a1f083f09998c380d5548f47066bad61aef40)
+- 2014-03-26 (sshwsfc) Update tests for the new instance method of the AdminSite class -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/b5b6ab7395687e5cdf3ca989669f4e81fae4867a)
+- 2014-03-26 (sshwsfc) Fixed #127 Enable simultaneous work of classical admin and xadmin sites -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/9f421ca0c67590ee878c7f5c6ecef89083bebb96)
+- 2014-03-26 (Jove Yu) add app_label trans -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/4f26691d27060845597143543f8fa8972252b4cb)
+- 2014-03-26 (Jove Yu) fix xadmin.widget.select-transfer.js -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/b6e9362e453afc084ffd2a1e9e4ff49b5aad4e28)
+- 2014-03-25 (Alexander Moiseenko) fixed typo in the icon style name of booleans -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/67b092f7deb9c43f982f5e0a3149dcf3d56d2615)
+- 2014-03-19 (Jairus Martin) fixed get_step_form() checking for instance when it should be checking for a class -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/ed915741e8d84d3bdb2cffad7cb02b667fd65fbd)
+- 2014-03-19 (sshwsfc) Fixed #146 Font-awesome version 4.0.3 compatibility problem -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/27c91870e514a749b6df00553b4901d28e936570)
+- 2014-03-12 (Jairus Martin) Fixed clicking checkbox not applying filter -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/7750e82c9e86a970f84a89900de482ff6d9673d3)
+- 2014-03-11 (Jairus Martin) Added MultiSelectFieldListFilter -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/7b4ea1fd2ed20932512a587f8891e44e7165de2f)
+- 2014-03-10 (sshwsfc) Export icons fix -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/7e3b14dfdf8d207ed7ed0c8439288df3223cdc47)
+- 2014-03-10 (sshwsfc) Fix inline icon bug -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/ede9011c842c4a0df898b7289ecd7205d3ae8957)
+- 2014-03-10 (sshwsfc) Update version to 4.0.4 -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/d4ca92665cc895ea3bc1f2ce163e1f7b68ddf03e)
+- 2014-03-10 (sshwsfc) Update fontawesome to 4.0.3 -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/d892fa8c587f2f0ba7ecf86eb8879f8eacf146d0)
+- 2014-03-10 (sshwsfc) Update javascript files to compact fa icons new version -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/94c2f548affa34c78c75125b4778a16dd1a12776)
+- 2014-03-10 (sshwsfc) Update fa icons version -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/affb27fe063452f8e732e8298b4b4b7f007b3e0f)
+- 2014-03-05 (Javier Cordero) Fixed when changing a field using BatchAction wasn't allowed when the value validated to False, even when the field allows it, e.g. BooleanField couldn't be set to False -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/d5fca423e3ae10e3ca086e5ae9ea7068872f0a29)
+- 2014-02-28 (marshalys) add xlsxwriter info to README -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/45eeea6ff6b839cc90f7b52438442441604e8598)
+- 2014-02-28 (marshalys) add xlsxwriter info to README -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/f77f94a9821685db5059c719556b38d1edcf199b)
+- 2014-02-27 (marshalys) 增加Excel xlsx格式导出数据，可以支持大数据量导出 -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/895630328e4af275b7a67026b2e1e5e91f149287)
+- 2014-02-19 (Jairus Martin) Fixed reverse many 2 many lookup giving FieldDoesNotExist error. -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/f067e92ace37a9e849623780f5a06ab9563bf361)
+- 2014-02-14 (Jairus Martin) Add related model name to spec title if it's a related field -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/0f4dd9e60ba03cb4679c77b5ddc391b66830f06c)
+- 2014-02-13 (Taras Nek) fix export format for Null fields -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/cc8f724f2e6e2655bd82bb434986e51e99804abf)
+- 2014-02-12 (Jairus) Added demo graphs -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/f79f4324f773abe5df18ee33655bf6288c43aa84)
+- 2014-02-12 (Jason Thaxter) Improve English usage: "Is Shared" -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/71251413261682d1baec8f64bad786f97901ef68)
+- 2014-02-12 (Jairus Martin) Removed unnecessary div -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/7a740ee490f7de13be74065d8b51af30246e8fc1)
+- 2014-02-12 (Jairus Martin) Added support for flot categories and flot aggregate. -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/29618640a77700601b89cb7e4aed334c16176c14)
+- 2014-02-10 (Jairus Martin) Made related name plural -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/f98bcacd4f637a393408d01fdebffdf5e5a84f83)
+- 2014-01-10 (sshwsfc) Update translate files. -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/7e40dbaf287ca3c26af6deedffeba274b9aead35)
+- 2014-01-09 (sshwsfc) Upgrade reversion models admin list page. -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/3f5c33deba2bb332f0c810e9c0207f3e0710210c)
+- 2014-01-09 (sshwsfc) Fix #90 _has_changed is Dropped in Django 1.6 -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/f3b2851b9f9be53349d6b896c53271a6e5813723)
+- 2014-01-09 (sshwsfc) Fix #89 Error in model admin list when there is not column selected. -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/29ddf96801a18098d67d77286ddae99734115678)
+- 2013-12-27 (allenhu) remove margin-top assigned to the quick-form -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/4f0a5bcca71141c3029ecba2aed3a94db77bd0c8)
+- 2013-12-26 (allenhu) fix Golbe -> Global -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/79483d8c484c97cda97311222827aced865d50df)
+- 2013-12-11 (sshwsfc) Add new view "FormAdminView" for easy creating settings view page. -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/fb3a32023e723339e59c3e8fd48acfcad9c01188)
+- 2013-11-25 (Javier Cordero) Removed call to Model._meta.get_ordered_objects(), it was removed from django 1.6 -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/8593ab2831b0e46481392dd1980ce940e1d39b92)
+- 2013-11-20 (fxiao) [fixes #84] Checkbox is not real-time editing -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/bbf58b83669d3f7eaa59038bd24b6481458fb55d)

changelog.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+# Author: tim.tang
+rm -f changelog.md
+
+git for-each-ref --sort='*authordate' --format='%(tag)' refs/tags | grep -v '^$' | tail -r | while read TAG ; do
+    echo
+    if [ $NEXT ];then
+        echo '       ' >> changelog.md
+        echo *$NEXT* >> changelog.md
+        echo '---' >> changelog.md
+    else
+        echo '       ' >> changelog.md
+        echo *CURRENT* >> changelog.md
+        echo '---' >> changelog.md
+    fi
+
+    echo '    ' >> changelog.md
+    GIT_PAGER=cat git log --no-merges --date=short  --pretty=format:'- %ad (%an) %s -> [view commit](https://github.com/sshwsfc/django-xadmin/commit/%H)' $TAG..$NEXT >> changelog.md
+    echo '    ' >> changelog.md
+    NEXT=$TAG
+done
+echo "DONE."

demo_app/app/adminx.py

@@ -1,12 +1,10 @@
 import xadmin
 from xadmin import views
-from models import *
-from xadmin.layout import *
-
+from models import IDC, Host, MaintainLog, HostGroup, AccessRecord
+from xadmin.layout import Main, TabHolder, Tab, Fieldset, Row, Col, AppendedText, Side
 from xadmin.plugins.inline import Inline
 from xadmin.plugins.batch import BatchChangeAction
 
-
 class MainDashboard(object):
     widgets = [
         [
@@ -29,12 +27,13 @@ class BaseSetting(object):
 xadmin.site.register(views.BaseAdminView, BaseSetting)
 
 
-class GolbeSetting(object):
-    globe_search_models = [Host, IDC]
-    globe_models_icon = {
-        Host: 'laptop', IDC: 'cloud'
+class GlobalSetting(object):
+    global_search_models = [Host, IDC]
+    global_models_icon = {
+        Host: 'fa fa-laptop', IDC: 'fa fa-cloud'
     }
-xadmin.site.register(views.CommAdminView, GolbeSetting)
+    menu_style = 'default'#'accordion'
+xadmin.site.register(views.CommAdminView, GlobalSetting)
 
 
 class MaintainInline(object):
@@ -76,8 +75,9 @@ def open_web(self, instance):
 
     search_fields = ['name', 'ip', 'description']
     list_filter = ['idc', 'guarantee_date', 'status', 'brand', 'model',
-                   'cpu', 'core_num', 'hard_disk', 'memory', 'service_type']
-
+                   'cpu', 'core_num', 'hard_disk', 'memory', ('service_type',xadmin.filters.MultiSelectFieldListFilter)]
+    
+    list_quick_filter = ['service_type',{'field':'idc__name','limit':10}]
     list_bookmarks = [{'title': "Need Guarantee", 'query': {'status__exact': 2}, 'order': ('-guarantee_date',), 'cols': ('brand', 'guarantee_date', 'service_type')}]
 
     show_detail_fields = ('idc',)
@@ -86,18 +86,19 @@ def open_web(self, instance):
     save_as = True
 
     aggregate_fields = {"guarantee_date": "min"}
+    grid_layouts = ('table', 'thumbnails')
 
     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'),
@@ -117,8 +118,16 @@ def open_web(self, instance):
     )
     inlines = [MaintainInline]
     reversion_enable = True
-
-
+    
+    data_charts = {
+        "host_service_type_counts": {'title': u"Host service type count", "x-field": "service_type", "y-field": ("service_type",), 
+                              "option": {
+                                         "series": {"bars": {"align": "center", "barWidth": 0.8,'show':True}}, 
+                                         "xaxis": {"aggregate": "count", "mode": "categories"},
+                                         },
+                              },
+    }
+    
 class HostGroupAdmin(object):
     list_display = ('name', 'description')
     list_display_links = ('name',)
@@ -173,8 +182,18 @@ def avg_count(self, instance):
     refresh_times = (3, 5, 10)
     data_charts = {
         "user_count": {'title': u"User Report", "x-field": "date", "y-field": ("user_count", "view_count"), "order": ('date',)},
-        "avg_count": {'title': u"Avg Report", "x-field": "date", "y-field": ('avg_count',), "order": ('date',)}
+        "avg_count": {'title': u"Avg Report", "x-field": "date", "y-field": ('avg_count',), "order": ('date',)},
+        "per_month": {'title': u"Monthly Users", "x-field": "_chart_month", "y-field": ("user_count", ), 
+                              "option": {
+                                         "series": {"bars": {"align": "center", "barWidth": 0.8,'show':True}}, 
+                                         "xaxis": {"aggregate": "sum", "mode": "categories"},
+                                         },
+                            },
     }
+    
+    def _chart_month(self,obj):
+        return obj.date.strftime("%B")
+        
 
 xadmin.site.register(Host, HostAdmin)
 xadmin.site.register(HostGroup, HostGroupAdmin)

demo_app/app/models.py

@@ -1,24 +1,6 @@
 from django.db import models
 
 
-class IDC(models.Model):
-    name = models.CharField(max_length=64)
-    description = models.TextField()
-
-    contact = models.CharField(max_length=32)
-    telphone = models.CharField(max_length=32)
-    address = models.CharField(max_length=128)
-    customer_id = models.CharField(max_length=128)
-
-    create_time = models.DateField(auto_now=True)
-
-    def __unicode__(self):
-        return self.name
-
-    class Meta:
-        verbose_name = u"IDC"
-        verbose_name_plural = verbose_name
-
 SERVER_STATUS = (
     (0, u"Normal"),
     (1, u"Down"),
@@ -38,8 +20,26 @@ class Meta:
 )
 
 
-class Host(models.Model):
+class IDC(models.Model):
+    name = models.CharField(max_length=64)
+    description = models.TextField()
+
+    contact = models.CharField(max_length=32)
+    telphone = models.CharField(max_length=32)
+    address = models.CharField(max_length=128)
+    customer_id = models.CharField(max_length=128)
+
+    create_time = models.DateField(auto_now=True)
 
+    def __unicode__(self):
+        return self.name
+
+    class Meta:
+        verbose_name = u"IDC"
+        verbose_name_plural = verbose_name
+
+
+class Host(models.Model):
     idc = models.ForeignKey(IDC)
     name = models.CharField(max_length=64)
     nagios_name = models.CharField(u"Nagios Host ID", max_length=64, blank=True, null=True)

demo_app/demo/settings.py

@@ -133,10 +133,11 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'django.contrib.admin',
 
     'xadmin',
     'crispy_forms',
-    'reversion',
+    #'reversion',
 
     'app',
 )

demo_app/demo/urls.py

@@ -4,9 +4,13 @@
 import xadmin
 xadmin.autodiscover()
 
-from xadmin.plugins import xversion
-xversion.registe_models()
+# from xadmin.plugins import xversion
+# xversion.register_models()
+
+from django.contrib import admin
+admin.autodiscover()
 
 urlpatterns = patterns('',
-                       url(r'', include(xadmin.site.urls)),
-                       )
+    url(r'^admin/', include(admin.site.urls)),
+    url(r'^', include(xadmin.site.urls))
+)

requirements.txt

@@ -1,4 +1,2 @@
-django>=1.4
-xlwt
-django-crispy-forms>=1.2.3
-django-reversion
+django>=1.5
+django-crispy-forms>=1.4.0

setup.py

@@ -1,30 +1,31 @@
 #!/usr/bin/env python
-from setuptools import setup, find_packages
+from setuptools import setup
 
-#version_tuple = __import__('xadmin').VERSION
-#version = ".".join([str(v) for v in version_tuple])
+# version_tuple = __import__('xadmin.version').VERSION
+# version = ".".join([str(v) for v in version_tuple])
 
 setup(
     name='django-xadmin',
-    version='0.1.12-dev',
+    version='0.5.0',
     description='Drop-in replacement of Django admin comes with lots of goodies, fully extensible with plugin support, pretty UI based on Twitter Bootstrap.',
     long_description=open('README.rst').read(),
     author='sshwsfc',
     author_email='[email protected]',
+    license=open('LICENSE').read(),
     url='http://www.xadmin.io',
-    download_url='http://github.com/sshwsfc/django-xadmin/archive/%3Cspan%20class="x x-first x-last">0.1.12.dev.zip',
+    download_url='http://github.com/sshwsfc/django-xadmin/archive/%3Cspan%20class="x x-first x-last">master.zip',
     packages=['xadmin', 'xadmin.plugins', 'xadmin.templatetags', 'xadmin.views'],
     include_package_data=True,
     install_requires=[
         'setuptools',
-        'django>=1.4',
-        'django-crispy-forms>=1.2.3',
-        'django-reversion',
+        'django>=1.5',
+        'django-crispy-forms>=1.4.0',
     ],
     extras_require={
-        'Excel': ['xlwt'],
+        'Excel': ['xlwt', 'xlsxwriter'],
+        'Reversion': ['django-reversion'],
     },
-    zip_safe=True,
+    zip_safe=False,
     keywords=['admin', 'django', 'xadmin', 'bootstrap'],
     classifiers=[
         'Development Status :: 4 - Beta',
@@ -35,7 +36,6 @@
         'Operating System :: OS Independent',
         "Programming Language :: JavaScript",
         'Programming Language :: Python',
-        "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Internet :: WWW/HTTP :: Dynamic Content",