diff --git a/frappe/offline/__init__.py b/frappe/events_streaming/__init__.py similarity index 100% rename from frappe/offline/__init__.py rename to frappe/events_streaming/__init__.py diff --git a/frappe/offline/doctype/__init__.py b/frappe/events_streaming/doctype/__init__.py similarity index 100% rename from frappe/offline/doctype/__init__.py rename to frappe/events_streaming/doctype/__init__.py diff --git a/frappe/offline/doctype/change_request/__init__.py b/frappe/events_streaming/doctype/change_request/__init__.py similarity index 100% rename from frappe/offline/doctype/change_request/__init__.py rename to frappe/events_streaming/doctype/change_request/__init__.py diff --git a/frappe/offline/doctype/change_request/change_request.js b/frappe/events_streaming/doctype/change_request/change_request.js similarity index 100% rename from frappe/offline/doctype/change_request/change_request.js rename to frappe/events_streaming/doctype/change_request/change_request.js diff --git a/frappe/offline/doctype/change_request/change_request.json b/frappe/events_streaming/doctype/change_request/change_request.json similarity index 91% rename from frappe/offline/doctype/change_request/change_request.json rename to frappe/events_streaming/doctype/change_request/change_request.json index a00385de3a..f7e09fa804 100644 --- a/frappe/offline/doctype/change_request/change_request.json +++ b/frappe/events_streaming/doctype/change_request/change_request.json @@ -14,7 +14,7 @@ { "fieldname": "follower_node", "fieldtype": "Link", - "label": "Follower Node", + "label": "Consumer Node", "options": "Node" }, { @@ -39,9 +39,9 @@ "options": "\nApproved\nRejected\nResolve Conflict" } ], - "modified": "2019-08-02 09:48:41.263955", + "modified": "2019-08-26 14:03:56.911041", "modified_by": "Administrator", - "module": "Offline", + "module": "Events Streaming", "name": "Change Request", "owner": "Administrator", "permissions": [ diff --git a/frappe/offline/doctype/change_request/change_request.py b/frappe/events_streaming/doctype/change_request/change_request.py similarity index 100% rename from frappe/offline/doctype/change_request/change_request.py rename to frappe/events_streaming/doctype/change_request/change_request.py diff --git a/frappe/offline/doctype/change_request/test_change_request.py b/frappe/events_streaming/doctype/change_request/test_change_request.py similarity index 100% rename from frappe/offline/doctype/change_request/test_change_request.py rename to frappe/events_streaming/doctype/change_request/test_change_request.py diff --git a/frappe/offline/doctype/node/__init__.py b/frappe/events_streaming/doctype/node/__init__.py similarity index 100% rename from frappe/offline/doctype/node/__init__.py rename to frappe/events_streaming/doctype/node/__init__.py diff --git a/frappe/offline/doctype/node/node.js b/frappe/events_streaming/doctype/node/node.js similarity index 100% rename from frappe/offline/doctype/node/node.js rename to frappe/events_streaming/doctype/node/node.js diff --git a/frappe/offline/doctype/node/node.json b/frappe/events_streaming/doctype/node/node.json similarity index 95% rename from frappe/offline/doctype/node/node.json rename to frappe/events_streaming/doctype/node/node.json index 24a4ae0dc6..68561b65d9 100644 --- a/frappe/offline/doctype/node/node.json +++ b/frappe/events_streaming/doctype/node/node.json @@ -55,9 +55,9 @@ "reqd": 1 } ], - "modified": "2019-08-23 15:36:48.462608", + "modified": "2019-08-26 12:49:32.387804", "modified_by": "Administrator", - "module": "Offline", + "module": "Events Streaming", "name": "Node", "owner": "Administrator", "permissions": [ diff --git a/frappe/offline/doctype/node/node.py b/frappe/events_streaming/doctype/node/node.py similarity index 100% rename from frappe/offline/doctype/node/node.py rename to frappe/events_streaming/doctype/node/node.py diff --git a/frappe/offline/doctype/node/test_node.py b/frappe/events_streaming/doctype/node/test_node.py similarity index 100% rename from frappe/offline/doctype/node/test_node.py rename to frappe/events_streaming/doctype/node/test_node.py diff --git a/frappe/offline/doctype/node_configuration/__init__.py b/frappe/events_streaming/doctype/node_configuration/__init__.py similarity index 100% rename from frappe/offline/doctype/node_configuration/__init__.py rename to frappe/events_streaming/doctype/node_configuration/__init__.py diff --git a/frappe/offline/doctype/node_configuration/node_configuration.js b/frappe/events_streaming/doctype/node_configuration/node_configuration.js similarity index 100% rename from frappe/offline/doctype/node_configuration/node_configuration.js rename to frappe/events_streaming/doctype/node_configuration/node_configuration.js diff --git a/frappe/offline/doctype/node_configuration/node_configuration.json b/frappe/events_streaming/doctype/node_configuration/node_configuration.json similarity index 90% rename from frappe/offline/doctype/node_configuration/node_configuration.json rename to frappe/events_streaming/doctype/node_configuration/node_configuration.json index fc03016e0e..6dec1052bb 100644 --- a/frappe/offline/doctype/node_configuration/node_configuration.json +++ b/frappe/events_streaming/doctype/node_configuration/node_configuration.json @@ -17,7 +17,7 @@ "fieldname": "follower_node", "fieldtype": "Link", "in_list_view": 1, - "label": "Follower Node", + "label": "Consumer Node", "options": "Node", "reqd": 1 }, @@ -25,14 +25,14 @@ "fieldname": "master_node", "fieldtype": "Link", "in_list_view": 1, - "label": "Master Node", + "label": "Producer Node", "options": "Node", "reqd": 1 }, { "fieldname": "rules_section", "fieldtype": "Section Break", - "label": "Rules for Follower" + "label": "Rules for Consumer" }, { "default": "0", @@ -60,9 +60,9 @@ "reqd": 1 } ], - "modified": "2019-08-11 22:35:18.561804", + "modified": "2019-08-26 14:03:17.668802", "modified_by": "Administrator", - "module": "Offline", + "module": "Events Streaming", "name": "Node Configuration", "owner": "Administrator", "permissions": [ diff --git a/frappe/offline/doctype/node_configuration/node_configuration.py b/frappe/events_streaming/doctype/node_configuration/node_configuration.py similarity index 100% rename from frappe/offline/doctype/node_configuration/node_configuration.py rename to frappe/events_streaming/doctype/node_configuration/node_configuration.py diff --git a/frappe/offline/doctype/node_configuration/test_node_configuration.py b/frappe/events_streaming/doctype/node_configuration/test_node_configuration.py similarity index 97% rename from frappe/offline/doctype/node_configuration/test_node_configuration.py rename to frappe/events_streaming/doctype/node_configuration/test_node_configuration.py index 92a11a430e..bdcc8c272d 100644 --- a/frappe/offline/doctype/node_configuration/test_node_configuration.py +++ b/frappe/events_streaming/doctype/node_configuration/test_node_configuration.py @@ -9,7 +9,7 @@ import time from frappe import _ from frappe.commands.site import new_site from frappe.frappeclient import FrappeClient -from frappe.offline.doctype.node_configuration.node_configuration import pull_master_data, get_current_node +from frappe.events_streaming.doctype.node_configuration.node_configuration import pull_master_data, get_current_node class TestNodeConfiguration(unittest.TestCase): def test_insert(self): diff --git a/frappe/offline/doctype/node_configuration_doctype/__init__.py b/frappe/events_streaming/doctype/node_configuration_doctype/__init__.py similarity index 100% rename from frappe/offline/doctype/node_configuration_doctype/__init__.py rename to frappe/events_streaming/doctype/node_configuration_doctype/__init__.py diff --git a/frappe/offline/doctype/node_configuration_doctype/node_configuration_doctype.js b/frappe/events_streaming/doctype/node_configuration_doctype/node_configuration_doctype.js similarity index 100% rename from frappe/offline/doctype/node_configuration_doctype/node_configuration_doctype.js rename to frappe/events_streaming/doctype/node_configuration_doctype/node_configuration_doctype.js diff --git a/frappe/offline/doctype/node_configuration_doctype/node_configuration_doctype.json b/frappe/events_streaming/doctype/node_configuration_doctype/node_configuration_doctype.json similarity index 87% rename from frappe/offline/doctype/node_configuration_doctype/node_configuration_doctype.json rename to frappe/events_streaming/doctype/node_configuration_doctype/node_configuration_doctype.json index 0d89391d60..c2c791e213 100644 --- a/frappe/offline/doctype/node_configuration_doctype/node_configuration_doctype.json +++ b/frappe/events_streaming/doctype/node_configuration_doctype/node_configuration_doctype.json @@ -17,9 +17,9 @@ } ], "istable": 1, - "modified": "2019-08-09 16:21:12.082995", + "modified": "2019-08-26 12:48:54.329431", "modified_by": "Administrator", - "module": "Offline", + "module": "Events Streaming", "name": "Node Configuration DocType", "owner": "Administrator", "permissions": [], diff --git a/frappe/offline/doctype/node_configuration_doctype/node_configuration_doctype.py b/frappe/events_streaming/doctype/node_configuration_doctype/node_configuration_doctype.py similarity index 100% rename from frappe/offline/doctype/node_configuration_doctype/node_configuration_doctype.py rename to frappe/events_streaming/doctype/node_configuration_doctype/node_configuration_doctype.py diff --git a/frappe/offline/doctype/node_configuration_doctype/test_node_configuration_doctype.py b/frappe/events_streaming/doctype/node_configuration_doctype/test_node_configuration_doctype.py similarity index 100% rename from frappe/offline/doctype/node_configuration_doctype/test_node_configuration_doctype.py rename to frappe/events_streaming/doctype/node_configuration_doctype/test_node_configuration_doctype.py diff --git a/frappe/offline/doctype/update_log/__init__.py b/frappe/events_streaming/doctype/update_log/__init__.py similarity index 100% rename from frappe/offline/doctype/update_log/__init__.py rename to frappe/events_streaming/doctype/update_log/__init__.py diff --git a/frappe/offline/doctype/update_log/test_update_log.py b/frappe/events_streaming/doctype/update_log/test_update_log.py similarity index 100% rename from frappe/offline/doctype/update_log/test_update_log.py rename to frappe/events_streaming/doctype/update_log/test_update_log.py diff --git a/frappe/offline/doctype/update_log/update_log.js b/frappe/events_streaming/doctype/update_log/update_log.js similarity index 100% rename from frappe/offline/doctype/update_log/update_log.js rename to frappe/events_streaming/doctype/update_log/update_log.js diff --git a/frappe/offline/doctype/update_log/update_log.json b/frappe/events_streaming/doctype/update_log/update_log.json similarity index 93% rename from frappe/offline/doctype/update_log/update_log.json rename to frappe/events_streaming/doctype/update_log/update_log.json index b532f54101..b579225531 100644 --- a/frappe/offline/doctype/update_log/update_log.json +++ b/frappe/events_streaming/doctype/update_log/update_log.json @@ -39,9 +39,9 @@ } ], "in_create": 1, - "modified": "2019-08-04 23:28:11.548894", + "modified": "2019-08-26 12:49:41.559411", "modified_by": "Administrator", - "module": "Offline", + "module": "Events Streaming", "name": "Update Log", "owner": "Administrator", "permissions": [ diff --git a/frappe/offline/doctype/update_log/update_log.py b/frappe/events_streaming/doctype/update_log/update_log.py similarity index 100% rename from frappe/offline/doctype/update_log/update_log.py rename to frappe/events_streaming/doctype/update_log/update_log.py diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py index f80df04ebd..41544c0ca4 100644 --- a/frappe/model/delete_doc.py +++ b/frappe/model/delete_doc.py @@ -122,7 +122,7 @@ def delete_doc(doctype=None, name=None, force=0, ignore_doctypes=None, for_reloa delete_tags_for_document(doc) # update log if doctype has followers - if not frappe.flags.in_install: + if not frappe.flags.in_install and not frappe.flags.in_migrate: make_update_log(doc, update_type = 'Delete') if doc and not for_reload: diff --git a/frappe/model/document.py b/frappe/model/document.py index ff92aeb252..915ef600a1 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -944,7 +944,7 @@ class Document(BaseDocument): frappe.flags.currently_saving.remove((self.doctype, self.name)) # make update log for doctypes having followers - if not frappe.flags.in_install: + if not frappe.flags.in_install and not frappe.flags.in_migrate: if self.flags.update_log_for_doc_creation: make_update_log(self, update_type = 'Create') self.flags.create_type_update_log = False diff --git a/frappe/modules.txt b/frappe/modules.txt index 5a3e4fefe1..3833971f20 100644 --- a/frappe/modules.txt +++ b/frappe/modules.txt @@ -12,4 +12,4 @@ Data Migration Chat Social Automation -Offline +Events Streaming \ No newline at end of file diff --git a/frappe/public/js/frappe/ui/toolbar/toolbar.js b/frappe/public/js/frappe/ui/toolbar/toolbar.js index c3f487058c..84e21b6590 100644 --- a/frappe/public/js/frappe/ui/toolbar/toolbar.js +++ b/frappe/public/js/frappe/ui/toolbar/toolbar.js @@ -303,7 +303,7 @@ frappe.ui.toolbar.setup_session_defaults = function() { frappe.ui.toolbar.pull_master_data = function() { frappe.call({ - method: 'frappe.offline.doctype.node_configuration.node_configuration.pull_master_data', + method: 'frappe.events_streaming.doctype.node_configuration.node_configuration.pull_master_data', callback: function(r) { if(r.message == 'success') { frappe.show_alert({message:'Successfully pulled master data', indicator:'green'});