diff --git a/bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_createTableOverview.py b/bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_createTableOverview.py index 4e3e978c0eb31f1e21f00d9e0677c0c33e8bae49..b854aef954ae18f158b8c871a954da6a98522031 100644 --- a/bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_createTableOverview.py +++ b/bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_createTableOverview.py @@ -28,20 +28,21 @@ def digestCaption(my_caption, my_caption_title, my_count, my_shift): match_doubles[my_caption_title] = my_count caption_relevant_count = my_count my_count += 1 - else: - caption_relevant_count = match_doubles[my_caption_title] - caption_id = caption_abbreviation + "-" + str(caption_relevant_count) - caption_dict = {} - caption_dict["input"] = my_caption - caption_dict["item"] = {} - caption_dict["item"]["id"] = caption_id - caption_dict["item"]["title"] = my_caption_title - caption_dict["output"] = setTableCaption( - caption_id, - my_caption_title, - my_shift - ) - caption_list.append(caption_dict) + + #caption_relevant_count = match_doubles[my_caption_title] + caption_id = caption_abbreviation + "-" + str(caption_relevant_count) + caption_dict = {} + caption_dict["input"] = my_caption + caption_dict["item"] = {} + caption_dict["item"]["id"] = caption_id + caption_dict["item"]["title"] = my_caption_title + caption_dict["output"] = setTableCaption( + caption_id, + my_caption_title, + my_shift + ) + caption_list.append(caption_dict) + return my_count # XXX single quotes? diff --git a/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_book_output_expected_002_en_html.html b/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_book_output_expected_002_en_html.html index a8b7d7a3692512f8b89d42168680316e787eb43f..8eff37b75df3794d19a3a9ffa5c6b67dc508ec0d 100644 --- a/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_book_output_expected_002_en_html.html +++ b/bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_book_output_expected_002_en_html.html @@ -470,13 +470,6 @@ style="text-align: left; vertical-align: top">Table description</td> </tr> - - <tr> - <td width="10%"><a id="Table-1"></a><span>Table-1</span></td> - <td width="90%" - style="text-align: left; vertical-align: top">Table description</td> - </tr> - </tbody> </table>