Fixed 733 - Properly escape text PKs

flask_admin/contrib/sqla/tools.py

@@ -4,7 +4,7 @@ from sqlalchemy.exc import DBAPIError
 from ast import literal_eval
 
 from flask.ext.admin._compat import filter_list
-from flask.ext.admin.tools import iterencode, iterdecode
+from flask.ext.admin.tools import iterencode, iterdecode, escape
 
 
 def parse_like_term(term):

flask_admin/contrib/sqla/view.py

@@ -360,7 +360,7 @@ class ModelView(BaseModelView):
         if isinstance(self._primary_key, tuple):
             return tools.iterencode(getattr(model, attr) for attr in self._primary_key)
         else:
-            return getattr(model, self._primary_key)
+            return tools.escape(getattr(model, self._primary_key))
 
     def scaffold_list_columns(self):
         """

flask_admin/tools.py

@@ -101,6 +101,15 @@ def get_dict_attr(obj, attr, default=None):
     return default
 
 
+def escape(value):
+    print value
+
+
+    return (as_unicode(value)
+            .replace(CHAR_ESCAPE, CHAR_ESCAPE + CHAR_ESCAPE)
+            .replace(CHAR_SEPARATOR, CHAR_ESCAPE + CHAR_SEPARATOR))
+
+
 def iterencode(iter):
     """
         Encode enumerable as compact string representation.