Commit 253af1dc authored by Artem Serga's avatar Artem Serga

#1 - Refine selector for tooltip

parent d71a3807
...@@ -142,11 +142,10 @@ class AdminModelConverter(ModelConverterBase): ...@@ -142,11 +142,10 @@ class AdminModelConverter(ModelConverterBase):
if not column.nullable and not isinstance(column.type, Boolean): if not column.nullable and not isinstance(column.type, Boolean):
kwargs['validators'].append(validators.Required()) kwargs['validators'].append(validators.Required())
# Apply label # Apply label and description if it isn't inline form field
kwargs['label'] = self._get_label(prop.key, kwargs) if self.view.model == mapper.class_:
kwargs['label'] = self._get_label(prop.key, kwargs)
# Apply description kwargs['description'] = self._get_description(prop.key, kwargs)
kwargs['description'] = self._get_description(prop.key, kwargs)
# Figure out default value # Figure out default value
default = getattr(column, 'default', None) default = getattr(column, 'default', None)
......
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
{{ name }} {{ name }}
{% endif %} {% endif %}
{% if c in admin_view.column_descriptions %} {% if c in admin_view.column_descriptions %}
<a class="icon-question-sign" title="{{ admin_view.column_descriptions[c] }}" href="#"></a> <a class="icon-question-sign js-tooltip" title="{{ admin_view.column_descriptions[c] }}" href="#"></a>
{% endif %} {% endif %}
</th> </th>
{% set column = column + 1 %} {% set column = column + 1 %}
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
<script language="javascript"> <script language="javascript">
(function($) { (function($) {
$('.icon-question-sign').tooltip(); $('.js-tooltip').tooltip();
{% if filter_groups is not none and filter_data is not none %} {% if filter_groups is not none and filter_data is not none %}
var filter = new AdminFilters('#filter_form', '.field-filters', var filter = new AdminFilters('#filter_form', '.field-filters',
{{ admin_view._filter_dict|tojson|safe }}, {{ admin_view._filter_dict|tojson|safe }},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment