From c12a40c923585bc6660afc73e330da63ebbae437 Mon Sep 17 00:00:00 2001 From: Anupam K Date: Sat, 18 Apr 2020 01:50:18 +0530 Subject: [PATCH] Linkedin, Twitter Integration --- .../doctype/social_media_post/social_media_post.js | 2 +- .../social_media_post/social_media_post.json | 14 +++++++++++--- .../doctype/social_media_post/social_media_post.py | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/erpnext/crm/doctype/social_media_post/social_media_post.js b/erpnext/crm/doctype/social_media_post/social_media_post.js index c858885d2b..690e27c79b 100644 --- a/erpnext/crm/doctype/social_media_post/social_media_post.js +++ b/erpnext/crm/doctype/social_media_post/social_media_post.js @@ -3,7 +3,7 @@ frappe.ui.form.on('Social Media Post', { validate: function(frm){ if(frm.doc.text.length > 280){ - frappe.throw("Length Must be less than 280.") + frappe.throw(__("Length Must be less than 280.")) } }, refresh: function(frm){ diff --git a/erpnext/crm/doctype/social_media_post/social_media_post.json b/erpnext/crm/doctype/social_media_post/social_media_post.json index e34f02b8b5..f8c23a7e46 100644 --- a/erpnext/crm/doctype/social_media_post/social_media_post.json +++ b/erpnext/crm/doctype/social_media_post/social_media_post.json @@ -20,6 +20,7 @@ "tweet_preview", "linkedin_section", "linkedin_post", + "column_break_15", "attachments_section", "image", "amended_from" @@ -29,7 +30,7 @@ "fieldname": "text", "fieldtype": "Small Text", "label": "Tweet", - "reqd": 1 + "mandatory_depends_on": "eval:doc.twitter ==1" }, { "fieldname": "image", @@ -64,6 +65,7 @@ "label": "Scheduled Time" }, { + "depends_on": "eval:doc.twitter ==1", "fieldname": "content", "fieldtype": "Section Break", "label": "Twitter" @@ -114,6 +116,7 @@ }, { "collapsible": 1, + "depends_on": "eval:doc.linkedin==1", "fieldname": "linkedin_section", "fieldtype": "Section Break", "label": "LinkedIn" @@ -127,12 +130,17 @@ { "fieldname": "linkedin_post", "fieldtype": "Text", - "label": "Post" + "label": "Post", + "mandatory_depends_on": "eval:doc.linkedin ==1" + }, + { + "fieldname": "column_break_15", + "fieldtype": "Column Break" } ], "is_submittable": 1, "links": [], - "modified": "2020-04-09 22:35:23.821991", + "modified": "2020-04-18 01:28:35.995490", "modified_by": "Administrator", "module": "CRM", "name": "Social Media Post", diff --git a/erpnext/crm/doctype/social_media_post/social_media_post.py b/erpnext/crm/doctype/social_media_post/social_media_post.py index 8b3387ebf2..672486deac 100644 --- a/erpnext/crm/doctype/social_media_post/social_media_post.py +++ b/erpnext/crm/doctype/social_media_post/social_media_post.py @@ -21,7 +21,7 @@ class SocialMediaPost(Document): self.db_set("twitter_post_id", twitter_post.id) if self.linkedin and not self.linkedin_post_id: linkedin = frappe.get_doc("LinkedIn Settings") - linkedin_post = linkedin.post(self.text, self.image) + linkedin_post = linkedin.post(self.linkedin_post, self.image) self.db_set("linkedin_post_id", linkedin_post.headers['X-RestLi-Id'].split(":")[-1]) self.db_set("post_status", "Posted")