fixed some problem with latest editor tab, thanks Paolo

CHANGELOG

@@ -1,3 +1,7 @@
+## 2.5.2
+
+- Web editor with tabs, thanks ilvalle
+
 ## 2.5.1
 
 - New style virtual fields in grid

VERSION

@@ -1 +1 @@
-Version 2.5.1-stable+timestamp.2013.06.06.10.53.45
+Version 2.5.1-stable+timestamp.2013.06.07.17.35.00

applications/admin/views/default/edit_js.html

@@ -2,7 +2,7 @@
     return XML('<li><span class="teletype-text">%s</span><span>%s</span></li>' % (combo, description))
 }}
 
-<form action="{{=URL('edit', args=filename)}}" method="post" name="editform" id="editform" class="form-inline">
+<form action="{{=URL('edit', args=filename)}}" method="post" name="editform" id="editform" class="form-inline row-fluid">
 <div class="span12 well well-small">
 	<label class="">{{=T('Save file:')}}</label>
 	<a value="save" title="{{=T('Save file: %s', filename)}}" href="#" name="save" onclick="return doClickSave();" class="icon saveicon" style="background-image: -webkit-linear-gradient(top,white,#E6E6E6);">{{=IMG(_src=URL('static', 'images/save_icon.png'), _alt=T('Save'))}}</a>

gluon/dal.py

@@ -6991,10 +6991,11 @@ class Row(object):
                 key = col
                 res = record._extra[col]
             else:
-                key = f
                 if isinstance(record.get(t, None), Row):
+                    key = f
                     res = record[t][f]
                 else:
+                    key = f
                     res = record[f]
             if mode == 'object':
                 return (key, res)