From b48d2921bbef1e1e2f8003853c008b4f43316bbf Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Tue, 12 May 2020 10:18:48 +0530
Subject: [PATCH] chore(installed-applications): renamed doctype and docfields

---
 .../__init__.py                               |  0
 .../installed_application.json}               | 40 +++++++++----------
 .../installed_application.py}                 |  2 +-
 .../installed_applications.json               |  4 +-
 .../installed_applications.py                 |  9 +++--
 5 files changed, 28 insertions(+), 27 deletions(-)
 rename frappe/core/doctype/{installed_application_details => installed_application}/__init__.py (100%)
 rename frappe/core/doctype/{installed_application_details/installed_application_details.json => installed_application/installed_application.json} (78%)
 rename frappe/core/doctype/{installed_application_details/installed_application_details.py => installed_application/installed_application.py} (84%)

diff --git a/frappe/core/doctype/installed_application_details/__init__.py b/frappe/core/doctype/installed_application/__init__.py
similarity index 100%
rename from frappe/core/doctype/installed_application_details/__init__.py
rename to frappe/core/doctype/installed_application/__init__.py
diff --git a/frappe/core/doctype/installed_application_details/installed_application_details.json b/frappe/core/doctype/installed_application/installed_application.json
similarity index 78%
rename from frappe/core/doctype/installed_application_details/installed_application_details.json
rename to frappe/core/doctype/installed_application/installed_application.json
index ec453c320f..1f32c557ce 100644
--- a/frappe/core/doctype/installed_application_details/installed_application_details.json
+++ b/frappe/core/doctype/installed_application/installed_application.json
@@ -4,27 +4,11 @@
  "doctype": "DocType",
  "engine": "InnoDB",
  "field_order": [
-  "application_name",
-  "application_version",
+  "app_name",
+  "app_version",
   "git_branch"
  ],
  "fields": [
-  {
-   "fieldname": "application_name",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Application Name",
-   "read_only": 1,
-   "reqd": 1
-  },
-  {
-   "fieldname": "application_version",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Application Version",
-   "read_only": 1,
-   "reqd": 1
-  },
   {
    "fieldname": "git_branch",
    "fieldtype": "Data",
@@ -32,14 +16,30 @@
    "label": "Git Branch",
    "read_only": 1,
    "reqd": 1
+  },
+  {
+   "fieldname": "app_name",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Application Name",
+   "read_only": 1,
+   "reqd": 1
+  },
+  {
+   "fieldname": "app_version",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Application Version",
+   "read_only": 1,
+   "reqd": 1
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-05-11 19:54:07.141641",
+ "modified": "2020-05-12 10:09:49.148087",
  "modified_by": "Administrator",
  "module": "Core",
- "name": "Installed Application Details",
+ "name": "Installed Application",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
diff --git a/frappe/core/doctype/installed_application_details/installed_application_details.py b/frappe/core/doctype/installed_application/installed_application.py
similarity index 84%
rename from frappe/core/doctype/installed_application_details/installed_application_details.py
rename to frappe/core/doctype/installed_application/installed_application.py
index 3dd2b67228..6bb12afc49 100644
--- a/frappe/core/doctype/installed_application_details/installed_application_details.py
+++ b/frappe/core/doctype/installed_application/installed_application.py
@@ -6,5 +6,5 @@ from __future__ import unicode_literals
 # import frappe
 from frappe.model.document import Document
 
-class InstalledApplicationDetails(Document):
+class InstalledApplication(Document):
 	pass
diff --git a/frappe/core/doctype/installed_applications/installed_applications.json b/frappe/core/doctype/installed_applications/installed_applications.json
index 8f0e658d92..f2345e66b2 100644
--- a/frappe/core/doctype/installed_applications/installed_applications.json
+++ b/frappe/core/doctype/installed_applications/installed_applications.json
@@ -12,13 +12,13 @@
    "fieldname": "installed_applications",
    "fieldtype": "Table",
    "label": "Installed Applications",
-   "options": "Installed Application Details",
+   "options": "Installed Application",
    "read_only": 1
   }
  ],
  "issingle": 1,
  "links": [],
- "modified": "2020-05-11 19:52:47.775562",
+ "modified": "2020-05-12 10:09:14.310622",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "Installed Applications",
diff --git a/frappe/core/doctype/installed_applications/installed_applications.py b/frappe/core/doctype/installed_applications/installed_applications.py
index 0b9603a005..aa0401f368 100644
--- a/frappe/core/doctype/installed_applications/installed_applications.py
+++ b/frappe/core/doctype/installed_applications/installed_applications.py
@@ -7,11 +7,12 @@ import frappe
 from frappe.model.document import Document
 
 class InstalledApplications(Document):
-	def before_save(self):
+	def update_versions(self):
 		self.delete_key("installed_applications")
 		for app in frappe.utils.get_installed_apps_info():
 			self.append("installed_applications", {
-				"application_name": app.get("app_name"),
-				"application_version": app.get("version"),
+				"app_name": app.get("app_name"),
+				"app_version": app.get("version"),
 				"git_branch": app.get("branch")
-			})
\ No newline at end of file
+			})
+		self.save()
\ No newline at end of file