Small fixes

flask_admin/model/base.py

@@ -459,12 +459,11 @@ class BaseModelView(BaseView, ActionsMixin):
         actions endpoints are accessible.
     """
 
-    column_list_row_actions = None
+    column_extra_row_actions = None
     """
         List of row actions (instances of :class:`~flask_admin.model.template.BaseListRowAction`).
 
-        Behaviour of this field is affected by `columns_override_default_row_actions` field
-        value. By default, Flask-Admin will generate standard per-row actions (edit, delete, etc)
+        Flask-Admin will generate standard per-row actions (edit, delete, etc)
         and will append custom actions from this list right after them.
 
         For example::
@@ -478,12 +477,6 @@ class BaseModelView(BaseView, ActionsMixin):
                 ]
     """
 
-    column_override_default_row_actions = False
-    """
-        If set to `True`, will disable default row actions (view, edit, etc) and will only use
-        items from `column_list_row_actions`.
-    """
-
     simple_list_pager = False
     """
         Enable or disable simple list pager.
@@ -954,26 +947,24 @@ class BaseModelView(BaseView, ActionsMixin):
         """
             Return list of row action objects, each is instance of :class:`~flask_admin.model.template.BaseListRowAction`
         """
-        # TODO: Maybe pre-calculate
         actions = []
 
-        if not self.column_override_default_row_actions:
-            if self.can_view_details:
-                if self.details_modal:
-                    actions.append(template.ViewPopupRowAction())
-                else:
-                    actions.append(template.ViewRowAction())
+        if self.can_view_details:
+            if self.details_modal:
+                actions.append(template.ViewPopupRowAction())
+            else:
+                actions.append(template.ViewRowAction())
 
-            if self.can_edit:
-                if self.edit_modal:
-                    actions.append(template.EditPopupRowAction())
-                else:
-                    actions.append(template.EditRowAction())
+        if self.can_edit:
+            if self.edit_modal:
+                actions.append(template.EditPopupRowAction())
+            else:
+                actions.append(template.EditRowAction())
 
-            if self.can_delete:
-                actions.append(template.DeleteRowAction())
+        if self.can_delete:
+            actions.append(template.DeleteRowAction())
 
-        return actions + (self.column_list_row_actions or [])
+        return actions + (self.column_extra_row_actions or [])
 
     def get_details_columns(self):
         """

flask_admin/templates/bootstrap2/admin/model/row_actions.html

@@ -7,7 +7,7 @@
 {% endmacro %}
 
 {% macro view_row(action, row_id, row) %}
-  {{ link(action, get_url('.details_view', id=row_id, url=return_url), 'fa fa-eye glyphicon glyphicon-eye-open') }}
+  {{ link(action, get_url('.details_view', id=row_id, url=return_url), 'fa fa-eye glyphicon icon-eye-open') }}
 {% endmacro %}
 
 {% macro view_row_popup(action, row_id, row) %}
@@ -15,7 +15,7 @@
 {% endmacro %}
 
 {% macro edit_row(action, row_id, row) %}
-  {{ link(action, get_url('.edit_view', id=row_id, url=return_url), 'fa fa-pencil glyphicon glyphicon-pencil') }}
+  {{ link(action, get_url('.edit_view', id=row_id, url=return_url), 'fa fa-pencil glyphicon icon-pencil') }}
 {% endmacro %}
 
 {% macro edit_row_popup(action, row_id, row) %}