diff --git a/app/api/services/myproduct.py b/app/api/services/myproduct.py index 7418bdb..0ba59df 100644 --- a/app/api/services/myproduct.py +++ b/app/api/services/myproduct.py @@ -531,7 +531,7 @@ class MyProductsService(BaseService): testimonialFields = SettingsItemsData.get_site_testimonial_settings() blogConnect = False - if product_data.blog_product_id != None or product_data.blog_product_id != '': + if product_data.blog_product_id != None and product_data.blog_product_id != '': blogConnect = True blog_product_data = Products.get_product_by_product_id(product_data.blog_product_id) @@ -584,10 +584,19 @@ class MyProductsService(BaseService): "color_scheme_tab": {"title": 'Color Scheme', "controls": 'color-scheme', "active": '', "custom": True, "data": {}, "list_order": 19} } - if blogConnect: - settings_items["blog_connect_tab"] = {"title": 'Blog Connect', "controls": 'blog-connect-scheme', "active": '', - "custom": True, "data": {}, "list_order": 9} + if product_id == "A000006": + settings_items = { + "merms_emr_settings": {"title": 'EMR Settings', "controls": 'merms-emr-settings', "active": '', + "custom": True, "data": {}, "list_order": 1}, + "merms_emr_users": {"title": 'Users Admin', "controls": 'merms-emr-users', "active": '', + "custom": True, "data": {}, "list_order": 19}, + } + + if blogConnect: + settings_items["blog_connect_tab"] = {"title": 'Blog Connect', "controls": 'blog-connect-scheme', + "active": '', + "custom": True, "data": {}, "list_order": 9} # Simulate processing response_data = { diff --git a/app/api/services/office_dashboard.py b/app/api/services/office_dashboard.py index 0ab2144..c85411c 100644 --- a/app/api/services/office_dashboard.py +++ b/app/api/services/office_dashboard.py @@ -376,6 +376,8 @@ class OfficeDashboardService(BaseService): 'external_url': membersSubResult.external_url, 'dns_group': membersSubResult.dns_group, 'product_template': membersSubResult.product_template, + 'primary_server': membersSubResult.primary_server, + 'provision_port': membersSubResult.provision_port, 'custom_template': membersSubResult.custom_template, 'status': membersSubResult.status, 'updated': membersSubResult.updated,