From 241d13743fd4d86da2d5cec2d140a0b7e509b734 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 16 Jan 2019 13:39:55 +0530 Subject: [PATCH] refactor(dashboard): Move DocTypes to Desk module - Rename Chart to Dashboard Chart --- .../doctype/chart => desk/doctype/dashboard}/__init__.py | 0 frappe/{core => desk}/doctype/dashboard/dashboard.js | 0 frappe/{core => desk}/doctype/dashboard/dashboard.json | 6 +++--- frappe/{core => desk}/doctype/dashboard/dashboard.py | 0 frappe/{core => desk}/doctype/dashboard/test_dashboard.py | 0 .../dashboard => desk/doctype/dashboard_chart}/__init__.py | 0 .../doctype/dashboard_chart/dashboard_chart.js} | 2 +- .../doctype/dashboard_chart/dashboard_chart.json} | 6 +++--- .../doctype/dashboard_chart/dashboard_chart.py} | 2 +- .../doctype/dashboard_chart/test_dashboard_chart.py} | 2 +- 10 files changed, 9 insertions(+), 9 deletions(-) rename frappe/{core/doctype/chart => desk/doctype/dashboard}/__init__.py (100%) rename frappe/{core => desk}/doctype/dashboard/dashboard.js (100%) rename frappe/{core => desk}/doctype/dashboard/dashboard.json (96%) rename frappe/{core => desk}/doctype/dashboard/dashboard.py (100%) rename frappe/{core => desk}/doctype/dashboard/test_dashboard.py (100%) rename frappe/{core/doctype/dashboard => desk/doctype/dashboard_chart}/__init__.py (100%) rename frappe/{core/doctype/chart/chart.js => desk/doctype/dashboard_chart/dashboard_chart.js} (78%) rename frappe/{core/doctype/chart/chart.json => desk/doctype/dashboard_chart/dashboard_chart.json} (98%) rename frappe/{core/doctype/chart/chart.py => desk/doctype/dashboard_chart/dashboard_chart.py} (88%) rename frappe/{core/doctype/chart/test_chart.py => desk/doctype/dashboard_chart/test_dashboard_chart.py} (79%) diff --git a/frappe/core/doctype/chart/__init__.py b/frappe/desk/doctype/dashboard/__init__.py similarity index 100% rename from frappe/core/doctype/chart/__init__.py rename to frappe/desk/doctype/dashboard/__init__.py diff --git a/frappe/core/doctype/dashboard/dashboard.js b/frappe/desk/doctype/dashboard/dashboard.js similarity index 100% rename from frappe/core/doctype/dashboard/dashboard.js rename to frappe/desk/doctype/dashboard/dashboard.js diff --git a/frappe/core/doctype/dashboard/dashboard.json b/frappe/desk/doctype/dashboard/dashboard.json similarity index 96% rename from frappe/core/doctype/dashboard/dashboard.json rename to frappe/desk/doctype/dashboard/dashboard.json index 27ddd19a0f..e7f2d73784 100644 --- a/frappe/core/doctype/dashboard/dashboard.json +++ b/frappe/desk/doctype/dashboard/dashboard.json @@ -65,7 +65,7 @@ "label": "Charts", "length": 0, "no_copy": 0, - "options": "Chart", + "options": "Dashboard Chart", "permlevel": 0, "precision": "", "print_hide": 0, @@ -90,9 +90,9 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2019-01-15 12:06:10.126944", + "modified": "2019-01-16 13:35:14.516114", "modified_by": "Administrator", - "module": "Core", + "module": "Desk", "name": "Dashboard", "name_case": "", "owner": "Administrator", diff --git a/frappe/core/doctype/dashboard/dashboard.py b/frappe/desk/doctype/dashboard/dashboard.py similarity index 100% rename from frappe/core/doctype/dashboard/dashboard.py rename to frappe/desk/doctype/dashboard/dashboard.py diff --git a/frappe/core/doctype/dashboard/test_dashboard.py b/frappe/desk/doctype/dashboard/test_dashboard.py similarity index 100% rename from frappe/core/doctype/dashboard/test_dashboard.py rename to frappe/desk/doctype/dashboard/test_dashboard.py diff --git a/frappe/core/doctype/dashboard/__init__.py b/frappe/desk/doctype/dashboard_chart/__init__.py similarity index 100% rename from frappe/core/doctype/dashboard/__init__.py rename to frappe/desk/doctype/dashboard_chart/__init__.py diff --git a/frappe/core/doctype/chart/chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js similarity index 78% rename from frappe/core/doctype/chart/chart.js rename to frappe/desk/doctype/dashboard_chart/dashboard_chart.js index 70d191d079..ff84a0a976 100644 --- a/frappe/core/doctype/chart/chart.js +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js @@ -1,7 +1,7 @@ // Copyright (c) 2019, Frappe Technologies and contributors // For license information, please see license.txt -frappe.ui.form.on('Chart', { +frappe.ui.form.on('Dashboard Chart', { refresh: function(frm) { } diff --git a/frappe/core/doctype/chart/chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json similarity index 98% rename from frappe/core/doctype/chart/chart.json rename to frappe/desk/doctype/dashboard_chart/dashboard_chart.json index 7b6751e116..8e267759e7 100644 --- a/frappe/core/doctype/chart/chart.json +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json @@ -186,10 +186,10 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2019-01-15 14:46:06.870884", + "modified": "2019-01-16 13:34:58.802451", "modified_by": "Administrator", - "module": "Core", - "name": "Chart", + "module": "Desk", + "name": "Dashboard Chart", "name_case": "", "owner": "Administrator", "permissions": [ diff --git a/frappe/core/doctype/chart/chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py similarity index 88% rename from frappe/core/doctype/chart/chart.py rename to frappe/desk/doctype/dashboard_chart/dashboard_chart.py index 28ba6ba42b..99c6f9717f 100644 --- a/frappe/core/doctype/chart/chart.py +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py @@ -6,5 +6,5 @@ from __future__ import unicode_literals import frappe from frappe.model.document import Document -class Chart(Document): +class DashboardChart(Document): pass diff --git a/frappe/core/doctype/chart/test_chart.py b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py similarity index 79% rename from frappe/core/doctype/chart/test_chart.py rename to frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py index 773e956f7b..a9aa0b2263 100644 --- a/frappe/core/doctype/chart/test_chart.py +++ b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py @@ -6,5 +6,5 @@ from __future__ import unicode_literals import frappe import unittest -class TestChart(unittest.TestCase): +class TestDashboardChart(unittest.TestCase): pass