diff --git a/services/web/project/__init__.py b/services/web/project/__init__.py index f74dc63..40aaf3a 100644 --- a/services/web/project/__init__.py +++ b/services/web/project/__init__.py @@ -684,7 +684,7 @@ def product_urls(current_user): user_uid = current_user["user"]["uid"] user_id = current_user["user"]["id"] PRODUCT_URL = f"""SELECT mp.id AS no, p.name AS description, - mp.added::text AS date, 'https://'||''||mp.internal_url AS url, + mp.added::text AS date, 'https://'||''||mp.internal_url AS url, mp.product_id, (CASE WHEN mp.status=6 THEN 'Preparing' WHEN mp.status =7 THEN 'Active' ELSE 'Unknown' END) AS status, 'https://' AS http FROM members_products mp LEFT JOIN products p ON p.product_id =mp.product_id AND mp.member_id = {user_id}""" @@ -700,13 +700,7 @@ def product_urls(current_user): url_data = { "last_update": datetime.datetime.utcnow(), - "url": array3, - "url2": [ - {"no": "1", "description": "Main Website", "url":'https://ameye01.0ach30996.mermsemr.com', "date": "10-10-2010 11:00 AM", "status": 'Active'}, - {"no": "1", "description": "Personal Blog", "url":'https://starterblo.0ach31996.mermsemr.com', "date": "10-10-2010 11:00 AM", "status": 'Updating'}, - {"no": "1", "description": "Business Web", "url":'https://starterolu.0ach30996.mermsemr.com', "date": "10-10-2010 11:00 AM", "status": 'Active'}, - {"no": "1", "description": "Business Blog", "url":'https://starterbblog.0ach30996.mermsemr.com', "date": "10-10-2010 11:00 AM", "status": 'Active'}, - ] + "url": array3 } return jsonify(url_data=url_data)