UI - Watchlist - bring back Restock & Price column to watchlist overview (#4410)

changedetectionio/blueprint/watchlist/row_context.py

@@ -30,10 +30,10 @@ def watch_row_context(datastore, active_tag_uuid=None, queued_uuids=None):
 
     return {
         'active_tag_uuid': active_tag_uuid,
-        # Kept 0 (rather than any_watches_have_processor_by_name) while the price column is
-        # disabled — it also decides cols_required on the page, so page and row must agree or
-        # a pushed row ends up with a different <td> count than the table header.
-        'any_has_restock_price_processor': 0,
+        # Also decides cols_required on the page, so page and row must agree or a pushed row
+        # ends up with a different <td> count than the table header — which is why it is
+        # computed here and not passed separately by the page.
+        'any_has_restock_price_processor': datastore.any_watches_have_processor_by_name("restock_diff"),
         'datastore': datastore,
         'has_proxies': datastore.proxy_list,
         'processor_descriptions': processors.get_processor_descriptions(),

changedetectionio/blueprint/watchlist/templates/watch-overview-single-row.html

@@ -100,6 +100,13 @@
                             {%- if watch.is_pdf  -%}<img class="status-icon" src="{{url_for('static_content', group='images', filename='pdf-icon.svg')}}" title="Converting PDF to text" alt="Converting PDF to text" >{%- endif -%}
                             {%- if watch.has_browser_steps -%}<img class="status-icon status-browsersteps" src="{{url_for('static_content', group='images', filename='steps.svg')}}" alt="Browser Steps is enabled" >{%- endif -%}
                     </div>
+
+                </div>
+
+                </td>
+
+{%- if any_has_restock_price_processor -%}
+                <td class="restock-and-price">
 {%- if watch['processor'] == 'restock_diff'  -%}
     {#-  @todo - this could be injected somehow watch.extra_row_info or something -#}
                     <div class="restock-info-wrap">
@@ -140,15 +147,9 @@
                             {%- endif -%}
                     </div>
 {%- endif -%}
-                </div>
-
-                </td>
-{#
-{%- if any_has_restock_price_processor -%}
-                <td class="restock-and-price">
                 </td>
 {%- endif -%}
-#}
+
             {#last_checked becomes fetch-start-time#}
                 <td class="last-checked" data-timestamp="{{ watch.last_checked }}" data-fetchduration={{ watch.fetch_time }} data-eta_complete="{{ watch.last_checked+watch.fetch_time }}" data-label="{{ _('Checked') }}">
                     <div class="spinner-wrapper" style="display:none;" >