Fix to admin settings encoding.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@169 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/settings/base.py b/forum/settings/base.py
index 5bcf5fc51a6d929c6c82209c15ca2a3b1d22e9a9..08f3ea8b60ca66504b9eb7477c30f3818356d717 100644 (file)
--- a/forum/settings/base.py
+++ b/forum/settings/base.py
@@ -29,9 +29,6 @@ class BaseSetting(object):
 
             Setting.sets[set.name].append(self)
 
 
             Setting.sets[set.name].append(self)
 

-    def __str__(self):
-        return str(self.value)
-

     def __unicode__(self):
         return unicode(self.value)
 
     def __unicode__(self):
         return unicode(self.value)
 

diff --git a/forum/skins/default/templates/osqaadmin/set.html b/forum/skins/default/templates/osqaadmin/set.html
index df91bd1a91f555d0796e0a472fd053dd08c1bdd7..9735de6f7ad237ccbd988a0424cad1c2dad9e325 100644 (file)
--- a/forum/skins/default/templates/osqaadmin/set.html
+++ b/forum/skins/default/templates/osqaadmin/set.html
@@ -8,7 +8,7 @@
 {% block description %}{{ form.set.description }}{% endblock %}\r
 \r
 {% block admincontent %}\r
 {% block description %}{{ form.set.description }}{% endblock %}\r
 \r
 {% block admincontent %}\r

-    <form action="" method="POST" enctype="multipart/form-data">\r
+    <form action="" method="POST" enctype="multipart/form-data" accept-charset="utf-8">\r

         <table id="admin_form">\r
             {{ form.as_table }}\r
             <tr>\r
         <table id="admin_form">\r
             {{ form.as_table }}\r
             <tr>\r