Browse Source

Merge "Fix "_data_table_action.html" template usage"

tags/16.0.0.0b2
Zuul 1 week ago
parent
commit
c82c955160

+ 1
- 1
horizon/tables/actions.py View File

@@ -376,7 +376,7 @@ class LinkAction(BaseAction):
376 376
 
377 377
     def render(self, **kwargs):
378 378
         action_dict = copy.copy(kwargs)
379
-        action_dict.update({"action": self, "is_single": True})
379
+        action_dict.update({"action": self, "is_single": True, "is_small": 0})
380 380
         return render_to_string("horizon/common/_data_table_action.html",
381 381
                                 action_dict)
382 382
 

+ 2
- 2
horizon/templates/horizon/common/_data_table_row_actions_dropdown.html View File

@@ -3,7 +3,7 @@
3 3
 {% spaceless %} {# This makes sure whitespace doesn't affect positioning for dropdown. #}
4 4
 
5 5
   {% if row_actions|length == 1 %}
6
-    {% include "horizon/common/_data_table_action.html" with action=row_actions.0 is_single=1 %}
6
+    {% include "horizon/common/_data_table_action.html" with action=row_actions.0 is_single=1 is_small=0 %}
7 7
   {% elif row_actions|length > 1 %}
8 8
     <div class="btn-group">
9 9
       {% for action in row_actions %}
@@ -15,7 +15,7 @@
15 15
           <ul class="dropdown-menu dropdown-menu-right row_actions">
16 16
         {% else %}
17 17
           <li>
18
-            {% include "horizon/common/_data_table_action.html" %}
18
+            {% include "horizon/common/_data_table_action.html" with is_small=0 %}
19 19
           </li>
20 20
         {% endif %}
21 21
         {% if forloop.last %}

+ 2
- 2
horizon/templates/horizon/common/_data_table_table_actions.html View File

@@ -39,7 +39,7 @@
39 39
     For each single action in the Table Actions area
40 40
   {% endcomment %}
41 41
   {% for action in table_actions_buttons %}
42
-    {% include "horizon/common/_data_table_action.html" with is_table_action=1 is_single=1 %}
42
+    {% include "horizon/common/_data_table_action.html" with is_table_action=1 is_single=1 is_small=0 %}
43 43
   {% endfor %}
44 44
 
45 45
   {% comment %}
@@ -58,7 +58,7 @@
58 58
       <ul class="dropdown-menu dropdown-menu-right">
59 59
       {% for action in table_actions_menu %}
60 60
         <li>
61
-          {% include "horizon/common/_data_table_action.html" with is_table_action=1 %}
61
+          {% include "horizon/common/_data_table_action.html" with is_table_action=1 is_small=0 %}
62 62
         </li>
63 63
       {% endfor %}
64 64
       </ul>

Loading…
Cancel
Save