" + __("Loading") + "..."); + this.body.html("
" + __("Loading") + "...
"); return; } if(!me.get_doctype() && !me.get_role()) { - this.body.html(""+__("Select Document Type or Role to start.")+""); + this.body.html("
"+__("Select Document Type or Role to start.")+"
"); return; } // get permissions @@ -247,10 +252,13 @@ frappe.PermissionEngine = Class.extend({ setup_user_permissions: function(d, role_cell) { var me = this; - d.help = frappe.render('', {}); + d.help = ``; var checkbox = this.add_check(role_cell, d, "apply_user_permissions") .removeClass("col-md-4") @@ -336,8 +344,8 @@ frappe.PermissionEngine = Class.extend({ var me = this; this.body.on("click", ".show-user-permissions", function() { - frappe.route_options = { doctype: me.get_doctype() || "" }; - frappe.set_route("user-permissions"); + frappe.route_options = { allow: me.get_doctype() || "" }; + frappe.set_route('List', 'User Permission'); }); this.body.on("click", "input[type='checkbox']", function() { diff --git a/frappe/core/page/permission_manager/permission_manager.py b/frappe/core/page/permission_manager/permission_manager.py index 626bb1c20d..ae3a3971e6 100644 --- a/frappe/core/page/permission_manager/permission_manager.py +++ b/frappe/core/page/permission_manager/permission_manager.py @@ -7,7 +7,7 @@ import frappe.defaults from frappe.modules.import_file import get_file_path, read_doc_from_file from frappe.translate import send_translations from frappe.permissions import (reset_perms, get_linked_doctypes, get_all_perms, - setup_custom_perms, add_permission) + setup_custom_perms, add_permission, update_permission_property) from frappe.core.doctype.doctype.doctype import (clear_permissions_cache, validate_permissions_for_doctype) from frappe import _ @@ -68,18 +68,8 @@ def add(parent, role, permlevel): @frappe.whitelist() def update(doctype, role, permlevel, ptype, value=None): frappe.only_for("System Manager") - - out = None - if setup_custom_perms(doctype): - out = 'refresh' - - name = frappe.get_value('Custom DocPerm', dict(parent=doctype, role=role, permlevel=permlevel)) - - frappe.db.sql("""update `tabCustom DocPerm` set `%s`=%s where name=%s"""\ - % (frappe.db.escape(ptype), '%s', '%s'), (value, name)) - validate_permissions_for_doctype(doctype) - - return out + out = update_permission_property(doctype, role, permlevel, ptype, value) + return 'refresh' if out else None @frappe.whitelist() def remove(doctype, role, permlevel): diff --git a/frappe/core/page/user_permissions/README.md b/frappe/core/page/user_permissions/README.md deleted file mode 100644 index e4fc779c6c..0000000000 --- a/frappe/core/page/user_permissions/README.md +++ /dev/null @@ -1 +0,0 @@ -Interface to set user defaults (DefaultValue). \ No newline at end of file diff --git a/frappe/core/page/user_permissions/__init__.py b/frappe/core/page/user_permissions/__init__.py deleted file mode 100644 index 0e57cb68c3..0000000000 --- a/frappe/core/page/user_permissions/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# MIT License. See license.txt - diff --git a/frappe/core/page/user_permissions/user_permissions.js b/frappe/core/page/user_permissions/user_permissions.js deleted file mode 100644 index 5cb81900eb..0000000000 --- a/frappe/core/page/user_permissions/user_permissions.js +++ /dev/null @@ -1,365 +0,0 @@ -frappe.pages['user-permissions'].on_page_load = function(wrapper) { - var page = frappe.ui.make_app_page({ - parent: wrapper, - title: __("User Permissions Manager"), - icon: "fa fa-shield", - single_column: true - }); - - frappe.breadcrumbs.add("Setup"); - - $("\ -\ - " + __("Edit Role Permissions") + "\ -
' + txt + '
').appendTo(this.body); - }, - refresh: function() { - var me = this; - if(!me.filters.user) { - this.body.html(""+__("Loading")+"...
"); - return; - } - if(!me.get_user() && !me.get_doctype()) { - this.body.html(""+__("Select User or DocType to start.")+"
"); - return; - } - // get permissions - return frappe.call({ - module: "frappe.core", - page: "user_permissions", - method: "get_permissions", - args: { - parent: me.get_user(), - defkey: me.get_doctype(), - defvalue: me.get_user_permission() - }, - callback: function(r) { - me.render(r.message); - } - }); - }, - show_user_permissions_table: function() { - var me = this; - this.table = $("' - +__("These restrictions will apply for Document Types where 'Apply User Permissions' is checked for the permission rule and a field with this value is present.") - +'
').appendTo(this.body); - - $.each([[__("Allow User"), 150], [__("If Document Type"), 150], [__("Is"),150], ["", 50]], - function(i, col) { - $("').appendTo(this.body)) - .click(function() { - var d = new frappe.ui.Dialog({ - title: __("Add A New Restriction"), - fields: [ - {fieldtype:"Select", label:__("Allow User"), - options:me.options.users, reqd:1, fieldname:"user"}, - {fieldtype:"Select", label: __("If Document Type"), fieldname:"defkey", - options:me.get_link_names(), reqd:1}, - {fieldtype:"Link", label:__("Is"), fieldname:"defvalue", - options:'[Select]', reqd:1}, - {fieldtype:"Button", label: __("Add"), fieldname:"add"}, - ] - }); - if(me.get_user()) { - d.set_value("user", me.get_user()); - d.get_input("user").prop("disabled", true); - } - if(me.get_doctype()) { - d.set_value("defkey", me.get_doctype()); - d.get_input("defkey").prop("disabled", true); - } - if(me.get_user_permission()) { - d.set_value("defvalue", me.get_user_permission()); - d.get_input("defvalue").prop("disabled", true); - } - - d.fields_dict["defvalue"].get_query = function(txt) { - if(!d.get_value("defkey")) { - frappe.throw(__("Please select Document Type")); - } - - return { - doctype: d.get_value("defkey") - } - }; - - d.get_input("add").click(function() { - var args = d.get_values(); - if(!args) { - return; - } - frappe.call({ - module: "frappe.core", - page: "user_permissions", - method: "add", - args: args, - callback: function(r) { - if(r.exc) { - frappe.msgprint(__("Did not add")); - } else { - me.refresh(); - } - } - }) - d.hide(); - }); - d.show(); - }); - } -}) diff --git a/frappe/core/page/user_permissions/user_permissions.json b/frappe/core/page/user_permissions/user_permissions.json deleted file mode 100644 index ab831e1919..0000000000 --- a/frappe/core/page/user_permissions/user_permissions.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "content": null, - "creation": "2013-01-01 18:50:55", - "docstatus": 0, - "doctype": "Page", - "icon": "fa fa-user", - "idx": 1, - "modified": "2014-05-28 16:53:43.103533", - "modified_by": "Administrator", - "module": "Core", - "name": "user-permissions", - "owner": "Administrator", - "page_name": "user-permissions", - "roles": [], - "script": null, - "standard": "Yes", - "style": null, - "title": "User Permissions Manager" -} \ No newline at end of file diff --git a/frappe/core/page/user_permissions/user_permissions.py b/frappe/core/page/user_permissions/user_permissions.py deleted file mode 100644 index 98d7e90095..0000000000 --- a/frappe/core/page/user_permissions/user_permissions.py +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# MIT License. See license.txt - -from __future__ import unicode_literals -import frappe -from frappe import _ -import frappe.defaults -from frappe.permissions import (can_set_user_permissions, add_user_permission, - remove_user_permission, get_valid_perms) -from frappe.core.doctype.user.user import get_system_users -from frappe.utils.csvutils import UnicodeWriter, read_csv_content_from_uploaded_file -from frappe.defaults import clear_default - -@frappe.whitelist() -def get_users_and_links(): - return { - "users": get_system_users(), - "link_fields": get_doctypes_for_user_permissions() - } - -@frappe.whitelist() -def get_permissions(parent=None, defkey=None, defvalue=None): - if defkey and not can_set_user_permissions(defkey, defvalue): - raise frappe.PermissionError - - conditions, values = _build_conditions(locals()) - - permissions = frappe.db.sql("""select name, parent, defkey, defvalue - from tabDefaultValue - where parent not in ('__default', '__global') - and substr(defkey,1,1)!='_' - and parenttype='User Permission' - {conditions} - order by parent, defkey""".format(conditions=conditions), values, as_dict=True) - - if not defkey: - out = [] - doctypes = get_doctypes_for_user_permissions() - for p in permissions: - if p.defkey in doctypes: - out.append(p) - permissions = out - - return permissions - -def _build_conditions(filters): - conditions = [] - values = {} - for key, value in filters.items(): - if filters.get(key): - conditions.append("and `{key}`=%({key})s".format(key=key)) - values[key] = value - - return "\n".join(conditions), values - -@frappe.whitelist() -def remove(user, name, defkey, defvalue): - if not can_set_user_permissions(defkey, defvalue): - frappe.throw(_("Cannot remove permission for DocType: {0} and Name: {1}").format( - defkey, defvalue), frappe.PermissionError) - - remove_user_permission(defkey, defvalue, user, name) - -@frappe.whitelist() -def add(user, defkey, defvalue): - if not can_set_user_permissions(defkey, defvalue): - frappe.throw(_("Cannot set permission for DocType: {0} and Name: {1}").format( - defkey, defvalue), frappe.PermissionError) - - add_user_permission(defkey, defvalue, user, with_message=True) - -def get_doctypes_for_user_permissions(): - '''Get doctypes for the current user where user permissions are applicable''' - user_roles = frappe.get_roles() - - if "System Manager" in user_roles: - doctypes = set([p.parent for p in get_valid_perms()]) - else: - doctypes = set([p.parent for p in get_valid_perms() if p.set_user_permissions]) - - single_doctypes = set([d.name for d in frappe.get_all("DocType", {"issingle": 1})]) - - return sorted(doctypes.difference(single_doctypes)) - - -@frappe.whitelist() -def get_user_permissions_csv(): - out = [["User Permissions"], ["User", "Document Type", "Value"]] - out += [[a.parent, a.defkey, a.defvalue] for a in get_permissions()] - - csv = UnicodeWriter() - for row in out: - csv.writerow(row) - - frappe.response['result'] = str(csv.getvalue()) - frappe.response['type'] = 'csv' - frappe.response['doctype'] = "User Permissions" - -@frappe.whitelist() -def import_user_permissions(): - frappe.only_for("System Manager") - rows = read_csv_content_from_uploaded_file(ignore_encoding=True) - clear_default(parenttype="User Permission") - - if rows[0][0]!="User Permissions" and rows[1][0] != "User": - frappe.throw(frappe._("Please upload using the same template as download.")) - - for row in rows[2:]: - add_user_permission(row[1], row[2], row[0]) diff --git a/frappe/defaults.py b/frappe/defaults.py index b4c7ff6452..0e6e23ffdc 100644 --- a/frappe/defaults.py +++ b/frappe/defaults.py @@ -48,25 +48,10 @@ def is_a_user_permission_key(key): return ":" not in key and key != frappe.scrub(key) def get_user_permissions(user=None): - if not user: - user = frappe.session.user - - return build_user_permissions(user) - -def build_user_permissions(user): - out = frappe.cache().hget("user_permissions", user) - if out==None: - out = {} - for key, value in frappe.db.sql("""select defkey, ifnull(defvalue, '') as defvalue - from tabDefaultValue where parent=%s and parenttype='User Permission'""", (user,)): - out.setdefault(key, []).append(value) - - # add profile match - if user not in out.get("User", []): - out.setdefault("User", []).append(user) - - frappe.cache().hset("user_permissions", user, out) - return out + from frappe.core.doctype.user_permission.user_permission \ + import get_user_permissions as _get_user_permissions + '''Return frappe.core.doctype.user_permissions.user_permissions._get_user_permissions (kept for backward compatibility)''' + return _get_user_permissions(user) def get_defaults(user=None): globald = get_defaults_for() diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py index 87e48b0450..ee7fffa242 100644 --- a/frappe/desk/form/load.py +++ b/frappe/desk/form/load.py @@ -70,7 +70,6 @@ def getdoctype(doctype, with_parent=False, cached_timestamp=None): if not docs: docs = get_meta_bundle(doctype) - frappe.response['user_permissions'] = get_user_permissions(docs) frappe.response['user_settings'] = get_user_settings(parent_dt or doctype) if cached_timestamp and docs[0].modified==cached_timestamp: @@ -102,16 +101,6 @@ def get_docinfo(doc=None, doctype=None, name=None): "rating": get_feedback_rating(doc.doctype, doc.name) } -def get_user_permissions(meta): - out = {} - all_user_permissions = frappe.defaults.get_user_permissions() - - for m in meta: - for df in m.get_fields_to_check_permissions(all_user_permissions): - out[df.options] = list(set(all_user_permissions[df.options])) - - return out - def get_attachments(dt, dn): return frappe.get_all("File", fields=["name", "file_name", "file_url", "is_private"], filters = {"attached_to_name": dn, "attached_to_doctype": dt}) diff --git a/frappe/docs/assets/img/desk/animated_line_graph.gif b/frappe/docs/assets/img/desk/animated_line_graph.gif new file mode 100644 index 0000000000..0b0e7b212c Binary files /dev/null and b/frappe/docs/assets/img/desk/animated_line_graph.gif differ diff --git a/frappe/docs/assets/img/desk/bar_graph.png b/frappe/docs/assets/img/desk/bar_graph.png index d25254af6d..b3bd89cc88 100644 Binary files a/frappe/docs/assets/img/desk/bar_graph.png and b/frappe/docs/assets/img/desk/bar_graph.png differ diff --git a/frappe/docs/assets/img/desk/line_graph.png b/frappe/docs/assets/img/desk/line_graph.png deleted file mode 100644 index 02c60c7c18..0000000000 Binary files a/frappe/docs/assets/img/desk/line_graph.png and /dev/null differ diff --git a/frappe/docs/assets/img/desk/line_graph_sales.png b/frappe/docs/assets/img/desk/line_graph_sales.png new file mode 100644 index 0000000000..0e70ae0031 Binary files /dev/null and b/frappe/docs/assets/img/desk/line_graph_sales.png differ diff --git a/frappe/docs/assets/img/desk/percentage_graph.png b/frappe/docs/assets/img/desk/percentage_graph.png new file mode 100644 index 0000000000..3a25d59479 Binary files /dev/null and b/frappe/docs/assets/img/desk/percentage_graph.png differ diff --git a/frappe/docs/contents.html b/frappe/docs/contents.html deleted file mode 100644 index 59d0b4459d..0000000000 --- a/frappe/docs/contents.html +++ /dev/null @@ -1,10 +0,0 @@ - - -
Build extensions to ERPNext or make your own app
-
- Frappe is a full stack web application framework written in Python, -Javascript, HTML/CSS with MySQL as the backend. It was built for ERPNext -but is pretty generic and can be used to build database driven apps.
- -The key differece in Frappe compared to other frameworks is that Frappe -is that meta-data is also treated as data and is used to build front-ends -very easily. Frappe comes with a full blown admin UI called the Desk -that handles forms, navigation, lists, menus, permissions, file attachment -and much more out of the box.
- -Frappe also has a plug-in architecture that can be used to build plugins -to ERPNext.
- -Frappe Framework was designed to build ERPNext, open source -ERP for managing small and medium sized businesses.
- - - -The MIT License (MIT)
- -Copyright (c) 2016 Frappe Technologies Pvt. Ltd.
- -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- - - \ No newline at end of file diff --git a/frappe/docs/user/en/guides/app-development/generating-docs.md b/frappe/docs/user/en/guides/app-development/generating-docs.md index 8494533d22..0775967494 100755 --- a/frappe/docs/user/en/guides/app-development/generating-docs.md +++ b/frappe/docs/user/en/guides/app-development/generating-docs.md @@ -1,18 +1,17 @@ # Generating Documentation Website for your App -Frappe version 6.7 onwards includes a full-blown documentation generator so that you can easily create a website for your app that has both user docs and developers docs (auto-generated). These pages are generated as static HTML pages so that you can add them as GitHub pages. +Frappe version 6.7 onwards includes a full-blown documentation generator so that you can easily create a website for your app that has both user docs and developers docs (auto-generated). + +Version 8.7 onwards, these will be generated in a target app. ## Writing Docs ### 1. Setting up docs -#### 1.1. Setup `docs.py` - The first step is to setup the docs folder. For that you must create a new file in your app `config/docs.py` if it is not auto-generated. In your `docs.py` file, add the following module properties. source_link = "https://github.com/[orgname]/[reponame]" - docs_base_url = "https://[orgname].github.io/[reponame]" headline = "This is what my app does" sub_heading = "Slightly more details with key features" long_description = """(long description in markdown)""" @@ -29,16 +28,6 @@ The first step is to setup the docs folder. For that you must create a new file pass -#### 1.2. Generate `/docs` - -To generate the docs for the `current` version, go to the command line and write - - bench --site [site] build-docs [appname] - -If you want to maintain versions of your docs, then you can add a version number instead of `current` - -This will create a `/docs` folder in your app. - ### 2. Add User Documentation To add user documentation, add folders and pages in your `/docs/user` folder in the same way you would build a website pages in the `www` folder. @@ -54,61 +43,28 @@ Some quick tips: While linking make sure you add `{{ docs_base_url }}` to all your links. - {% raw %}Link Description{% endraw %} + {% raw %}Link Description{% endraw %} ### 4. Adding Images You can add images in the `/docs/assets` folder. You can add links to the images as follows: - {% raw %}
{% endraw %}
-
----
-
-## Setting up output docs
-
-The output docs are generated in your `docs/appname` folder using the `write-docs` command.
-
----
-
-## Viewing Locally
-
-To test your docs locally, add a `--local` option to the `write-docs` command.
-
- bench --site [site] write-docs [appname] --local
-
-Then it will build urls so that you can view these files locally. To view them locally in your browser, you can use the Python SimpleHTTPServer
-
-Run this from your `docs/myapp` folder:
-
- python -m SimpleHTTPServer 8080
+ {% raw %}
{% endraw %}
---
-## Publishing to GitHub Pages
-To publish your docs on GitHub pages, you will have to create an empty and orphan branch in your repository called `gh-pages` and push your documentation there.
+## Building Docs
-1. To easily publish your docs on gh-pages, commit and push your `apps/docs` folder on you master branch first.
-2. The `/docs` generation will also generate a `/docs` folder in your bench, parallel to your `/sites` folder. e.g. `/frappe-bench/docs`
-3. Generate you documentation using the `write-docs` command.
-4. Go to your docs folder `cd docs/myapp`
-5. Checkout the gh-pages branch `git checkout --orphan gh-pages`
-6. Push your documentation to Github.
+You must create a new app that will have the output of the docs, which is called the "target" app. For example, the docs for ERPNext are hosted at erpnext.org, which is based on the app "foundation". You can create a new app just to push docs of any other app.
-Note > The branch name `gh-pages` is only if you are using GitHub. If you are hosting this on any other static file server, you can create any other orphan branch instead.
+To output docs to another app,
-Putting it all together:
+ bench --site [site] build-docs [app] --target [target_app]
- # build the apps/docs folder and write the compiled docs at docs/appname
- bench --site [site] build-docs [appname]
+This will create a new folder `/docs` inside the `www` folder of the target app and generate automatic docs (from code), model references and copy user docs and assets.
- # commit to the gh-pages branch (for GitHub Pages)
- cd docs/appname
- git checkout --orphan gh-pages
- git remote add origin [remote git repository]
- git add *
- git commit -m "Documentation Initialization"
- git push origin gh-pages
+To view the docs, just go the the `/docs` url on your target app. Example:
-To check your documentation online go to: https://[orgname].github.io/[reponame]
+ https://erpnext.org/docs
diff --git a/frappe/docs/user/en/guides/desk/making_graphs.md b/frappe/docs/user/en/guides/desk/making_graphs.md
index 9234fa58b4..720c9217bf 100644
--- a/frappe/docs/user/en/guides/desk/making_graphs.md
+++ b/frappe/docs/user/en/guides/desk/making_graphs.md
@@ -1,61 +1,100 @@
# Making Graphs
-The Frappe UI **Graph** object enables you to render simple line and bar graphs for a discreet set of data points. You can also set special checkpoint values and summary stats.
+The Frappe UI **Graph** object enables you to render simple line, bar or percentage graphs for single or multiple discreet sets of data points. You can also set special checkpoint values and summary stats.
### Example: Line graph
-Here's is an example of a simple sales graph:
-
- render_graph: function() {
- $('.form-graph').empty();
-
- var months = ['Aug', 'Sep', 'Oct', 'Nov', 'Dec', 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul'];
- var values = [2410, 3100, 1700, 1200, 2700, 1600, 2740, 1000, 850, 1500, 400, 2013];
-
- var goal = 2500;
- var current_val = 2013;
-
- new frappe.ui.Graph({
- parent: $('.form-graph'),
- width: 700,
- height: 140,
- mode: 'line-graph',
-
- title: 'Sales',
- subtitle: 'Monthly',
- y_values: values,
- x_points: months,
-
- specific_values: [
- {
- name: "Goal",
- line_type: "dashed", // "dashed" or "solid"
- value: goal
- },
- ],
- summary_values: [
- {
- name: "This month",
- color: 'green', // Indicator colors: 'grey', 'blue', 'red',
- // 'green', 'orange', 'purple', 'darkgrey',
- // 'black', 'yellow', 'lightblue'
- value: '₹ ' + current_val
- },
- {
- name: "Goal",
- color: 'blue',
- value: '₹ ' + goal
- },
- {
- name: "Completed",
- color: 'green',
- value: (current_val/goal*100).toFixed(1) + "%"
- }
- ]
- });
- },
-
-
-
-Setting the mode to 'bar-graph':
+Here's an example of a simple sales graph:
+
+ // Data
+ let months = ['August, 2016', 'September, 2016', 'October, 2016', 'November, 2016',
+ 'December, 2016', 'January, 2017', 'February, 2017', 'March, 2017', 'April, 2017',
+ 'May, 2017', 'June, 2017', 'July, 2017'];
+
+ let values1 = [24100, 31000, 17000, 12000, 27000, 16000, 27400, 11000, 8500, 15000, 4000, 20130];
+ let values2 = [17890, 10400, 12350, 20400, 17050, 23000, 7100, 13800, 16000, 20400, 11000, 13000];
+ let goal = 25000;
+ let current_val = 20130;
+
+ let g = new frappe.ui.Graph({
+ parent: $('.form-graph').empty(),
+ height: 200, // optional
+ mode: 'line', // 'line', 'bar' or 'percentage'
+
+ title: 'Sales',
+ subtitle: 'Monthly',
+
+ y: [
+ {
+ title: 'Data 1',
+ values: values1,
+ formatted: values1.map(d => '$ ' + d),
+ color: 'green' // Indicator colors: 'grey', 'blue', 'red',
+ // 'green', 'light-green', 'orange', 'purple', 'darkgrey',
+ // 'black', 'yellow', 'lightblue'
+ },
+ {
+ title: 'Data 2',
+ values: values2,
+ formatted: values2.map(d => '$ ' + d),
+ color: 'light-green'
+ }
+ ],
+
+ x: {
+ values: months.map(d => d.substring(0, 3)),
+ formatted: months
+ },
+
+ specific_values: [
+ {
+ name: 'Goal',
+ line_type: 'dashed', // 'dashed' or 'solid'
+ value: goal
+ },
+ ],
+
+ summary: [
+ {
+ name: 'This month',
+ color: 'orange',
+ value: '$ ' + current_val
+ },
+ {
+ name: 'Goal',
+ color: 'blue',
+ value: '$ ' + goal
+ },
+ {
+ name: 'Completed',
+ color: 'green',
+ value: (current_val/goal*100).toFixed(1) + "%"
+ }
+ ]
+ });
+
+
+
+`bar` mode yeilds:
+
+You can set the `colors` property of `x` to an array of color values for `percentage` mode:
+
+
+
+You can also change the values of an existing graph with a new set of `y` values:
+
+ setTimeout(() => {
+ g.change_values([
+ {
+ values: data[2],
+ formatted: data[2].map(d => d + 'L')
+ },
+ {
+ values: data[3],
+ formatted: data[3].map(d => d + 'L')
+ }
+ ]);
+ }, 1000);
+
+
diff --git a/frappe/docs/user/en/guides/reports-and-printing/how-to-make-query-report.md b/frappe/docs/user/en/guides/reports-and-printing/how-to-make-query-report.md
index 9eb11b066a..1e22757d7e 100755
--- a/frappe/docs/user/en/guides/reports-and-printing/how-to-make-query-report.md
+++ b/frappe/docs/user/en/guides/reports-and-printing/how-to-make-query-report.md
@@ -39,7 +39,7 @@ You can define complex queries such as:
### 4. Advanced (adding filters)
-If you are making a standard report, you can add filters in your query report just like [script reports](https://frappe.github.io/frappe/user/en/guides/reports-and-printing/how-to-make-script-reports) by adding a `.js` file in your query report folder. To include filters in your query, use `%(filter_key)s` where your filter value will be shown.
+If you are making a standard report, you can add filters in your query report just like [script reports](https://frappe.io/docs/user/en/guides/reports-and-printing/how-to-make-script-reports) by adding a `.js` file in your query report folder. To include filters in your query, use `%(filter_key)s` where your filter value will be shown.
For example
diff --git a/frappe/docs/user/en/guides/reports-and-printing/how-to-make-script-reports.md b/frappe/docs/user/en/guides/reports-and-printing/how-to-make-script-reports.md
index ab03c11051..74479a8b9c 100755
--- a/frappe/docs/user/en/guides/reports-and-printing/how-to-make-script-reports.md
+++ b/frappe/docs/user/en/guides/reports-and-printing/how-to-make-script-reports.md
@@ -4,9 +4,9 @@ You can create tabulated reports using server side scripts by creating a new Rep
> Note: You will need Administrator Permissions for this.
-Since these reports give you unrestricted access via Python scripts, they can only be created by Administrators. The script part of the report becomes a part of the repository of the application. If you have not created an app, [read this](https://frappe.github.io/frappe/user/en/guides/app-development/).
+Since these reports give you unrestricted access via Python scripts, they can only be created by Administrators. The script part of the report becomes a part of the repository of the application. If you have not created an app, [read this](https://frappe.io/docs/user/en/guides/app-development/).
-> Note: You must be in [Developer Mode](https://frappe.github.io/frappe/user/en/guides/app-development/how-enable-developer-mode-in-frappe) to do this
+> Note: You must be in [Developer Mode](https://frappe.io/docs/user/en/guides/app-development/how-enable-developer-mode-in-frappe) to do this
### 1. Create a new Report
diff --git a/frappe/docs/user/en/tutorial/before.md b/frappe/docs/user/en/tutorial/before.md
index 80f34e01dd..426101e1cc 100755
--- a/frappe/docs/user/en/tutorial/before.md
+++ b/frappe/docs/user/en/tutorial/before.md
@@ -6,11 +6,12 @@
#### 1. Python
-Frappe uses Python (v2.7) for server-side programming. It is highly recommended to learn Python before you start building apps with Frappe.
+Frappe uses Python (v2.7) for server-side programming. It is highly recommended to learn Python before you start building apps with Frappe.
To write quality server-side code, you must also include automated tests.
Resources:
+
1. [Codecademy Tutorial for Python](https://www.codecademy.com/learn/python)
1. [Official Python Tutorial](https://docs.python.org/2.7/tutorial/index.html)
1. [Basics of Test-driven development](http://code.tutsplus.com/tutorials/beginning-test-driven-development-in-python--net-30137)
@@ -19,11 +20,12 @@ Resources:
#### 2. MariaDB / MySQL
-To create database-driven apps with Frappe, you must understand the basics of database management, like how to install, login, create new databases, and basic SQL queries.
+To create database-driven apps with Frappe, you must understand the basics of database management, like how to install, login, create new databases, and basic SQL queries.
Resources:
+
1. [Codecademy Tutorial for SQL](https://www.codecademy.com/learn/learn-sql)
- 1. [A basic MySQL tutorial by DigitalOcean](https://www.digitalocean.com/community/tutorials/a-basic-mysql-tutorial)
+ 1. [A basic MySQL tutorial by DigitalOcean](https://www.digitalocean.com/community/tutorials/a-basic-mysql-tutorial)
1. [Getting started with MariaDB](https://mariadb.com/kb/en/mariadb/documentation/getting-started/)
---
@@ -33,6 +35,7 @@ Resources:
If you want to build user interfaces using Frappe, you will need to learn basic HTML / CSS and the Boostrap CSS Framework.
Resources:
+
1. [Codecademy Tutorial for HTML/CSS](https://www.codecademy.com/learn/learn-html-css)
1. [Getting started with Bootstrap](https://getbootstrap.com/getting-started/)
@@ -44,6 +47,7 @@ To customize forms and create rich user interfaces, you should learn JavaScript
Resources:
+
1. [Codecademy Tutorial for JavaScript](https://www.codecademy.com/learn/learn-javascript)
1. [Codecademy Tutorial for jQuery](https://www.codecademy.com/learn/jquery)
---
@@ -53,6 +57,7 @@ Resources:
If you are customizing Print templates or Web pages, you need to learn the Jinja Templating language. It is an easy way to create dynamic web pages (HTML).
Resources:
+
1. [Primer on Jinja Templating](https://realpython.com/blog/python/primer-on-jinja-templating/)
1. [Official Documentation](http://jinja.pocoo.org/)
@@ -63,6 +68,7 @@ Resources:
Learn how to contribute back to an open source project using Git and GitHub, two great tools to help you manage your code and share it with others.
Resources:
+
1. [Basic Git Tutorial](https://try.github.io)
2. [How to contribute to Open Source](https://opensource.guide/how-to-contribute/)
diff --git a/frappe/model/create_new.py b/frappe/model/create_new.py
index cc5c394d9f..846d8101e6 100644
--- a/frappe/model/create_new.py
+++ b/frappe/model/create_new.py
@@ -11,6 +11,7 @@ from frappe.utils import nowdate, nowtime, now_datetime
import frappe.defaults
from frappe.model.db_schema import type_map
import copy
+from frappe.core.doctype.user_permission.user_permission import get_user_permissions
def get_new_doc(doctype, parent_doc = None, parentfield = None, as_dict=False):
if doctype not in frappe.local.new_doc_templates:
@@ -47,7 +48,7 @@ def make_new_doc(doctype):
return doc
def set_user_and_static_default_values(doc):
- user_permissions = frappe.defaults.get_user_permissions()
+ user_permissions = get_user_permissions()
defaults = frappe.defaults.get_defaults()
for df in doc.meta.get("fields"):
@@ -103,7 +104,7 @@ def get_static_default_value(df, user_permissions):
def set_dynamic_default_values(doc, parent_doc, parentfield):
# these values should not be cached
- user_permissions = frappe.defaults.get_user_permissions()
+ user_permissions = get_user_permissions()
for df in frappe.get_meta(doc["doctype"]).get("fields"):
if df.get("default"):
diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py
index eeee7f4bf7..56e4cc343d 100644
--- a/frappe/model/db_query.py
+++ b/frappe/model/db_query.py
@@ -388,7 +388,7 @@ class DatabaseQuery(object):
# apply user permissions?
if role_permissions.get("apply_user_permissions", {}).get("read"):
# get user permissions
- user_permissions = frappe.defaults.get_user_permissions(self.user)
+ user_permissions = frappe.permissions.get_user_permissions(self.user)
self.add_user_permissions(user_permissions,
user_permission_doctypes=role_permissions.get("user_permission_doctypes").get("read"))
diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py
index 3bf49a5f6a..e242a48c88 100644
--- a/frappe/model/delete_doc.py
+++ b/frappe/model/delete_doc.py
@@ -11,7 +11,7 @@ from frappe.utils.file_manager import remove_all
from frappe.utils.password import delete_all_passwords_for
from frappe import _
from frappe.model.naming import revert_series_if_last
-from frappe.utils.global_search import delete_for_document
+from frappe.utils.global_search import delete_for_document
def delete_doc(doctype=None, name=None, force=0, ignore_doctypes=None, for_reload=False,
ignore_permissions=False, flags=None, ignore_on_trash=False):
@@ -158,8 +158,13 @@ def update_flags(doc, flags=None, ignore_permissions=False):
def check_permission_and_not_submitted(doc):
# permission
- if not doc.flags.ignore_permissions and frappe.session.user!="Administrator" and (not doc.has_permission("delete") or (doc.doctype=="DocType" and not doc.custom)):
- frappe.msgprint(_("User not allowed to delete {0}: {1}").format(doc.doctype, doc.name), raise_exception=True)
+ if (not doc.flags.ignore_permissions
+ and frappe.session.user!="Administrator"
+ and (
+ not doc.has_permission("delete")
+ or (doc.doctype=="DocType" and not doc.custom))):
+ frappe.msgprint(_("User not allowed to delete {0}: {1}")
+ .format(doc.doctype, doc.name), raise_exception=frappe.PermissionError)
# check if submitted
if doc.docstatus == 1:
diff --git a/frappe/patches.txt b/frappe/patches.txt
index 8adf636701..3347ae8287 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -189,3 +189,4 @@ frappe.patches.v8_1.enable_allow_error_traceback_in_system_settings
frappe.patches.v8_1.update_format_options_in_auto_email_report
frappe.patches.v8_1.delete_custom_docperm_if_doctype_not_exists
frappe.patches.v8_5.delete_email_group_member_with_invalid_emails
+frappe.patches.v8_x.update_user_permission
diff --git a/frappe/patches/v8_x/__init__.py b/frappe/patches/v8_x/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/patches/v8_x/update_user_permission.py b/frappe/patches/v8_x/update_user_permission.py
new file mode 100644
index 0000000000..4ceb26e945
--- /dev/null
+++ b/frappe/patches/v8_x/update_user_permission.py
@@ -0,0 +1,25 @@
+import frappe
+
+def execute():
+ frappe.reload_doc('core', 'doctype', 'user_permission')
+ frappe.delete_doc('core', 'page', 'user-permissions')
+ for perm in frappe.db.sql("""
+ select
+ name, parent, defkey, defvalue
+ from
+ tabDefaultValue
+ where
+ parent not in ('__default', '__global')
+ and
+ substr(defkey,1,1)!='_'
+ and
+ parenttype='User Permission'
+ """, as_dict=True):
+ frappe.get_doc(dict(
+ doctype='User Permission',
+ user=perm.parent,
+ allow=perm.defkey,
+ for_value=perm.defvalue
+ )).insert(ignore_permissions = True)
+
+ frappe.db.sql('delete from tabDefaultValue where parenttype="User Permission"')
diff --git a/frappe/permissions.py b/frappe/permissions.py
index 13da62d366..29f223d08e 100644
--- a/frappe/permissions.py
+++ b/frappe/permissions.py
@@ -7,7 +7,6 @@ import frappe, copy, json
from frappe import _, msgprint
from frappe.utils import cint
import frappe.share
-
rights = ("read", "write", "create", "delete", "submit", "cancel", "amend",
"print", "email", "report", "import", "export", "set_user_permissions", "share")
@@ -25,6 +24,9 @@ def has_permission(doctype, ptype="read", doc=None, verbose=False, user=None):
"""
if not user: user = frappe.session.user
+ if verbose:
+ print('--- Checking for {0} {1} ---'.format(doctype, doc.name if doc else '-'))
+
if frappe.is_table(doctype):
if verbose: print("Table type, always true")
return True
@@ -40,7 +42,7 @@ def has_permission(doctype, ptype="read", doc=None, verbose=False, user=None):
return False
if user=="Administrator":
- if verbose: print("Administrator")
+ if verbose: print("Allowing Administrator")
return True
def false_if_not_shared():
@@ -210,7 +212,10 @@ def get_role_permissions(meta, user=None, verbose=False):
if p.user_permission_doctypes:
# set user_permission_doctypes in perms
- user_permission_doctypes = json.loads(p.user_permission_doctypes)
+ try:
+ user_permission_doctypes = json.loads(p.user_permission_doctypes)
+ except ValueError:
+ user_permission_doctypes = []
else:
user_permission_doctypes = get_linked_doctypes(meta.name)
@@ -247,8 +252,12 @@ def get_role_permissions(meta, user=None, verbose=False):
return frappe.local.role_permissions[cache_key]
+def get_user_permissions(user):
+ from frappe.core.doctype.user_permission.user_permission import get_user_permissions
+ return get_user_permissions(user)
+
def user_has_permission(doc, verbose=True, user=None, user_permission_doctypes=None):
- from frappe.defaults import get_user_permissions
+ from frappe.core.doctype.user_permission.user_permission import get_user_permissions
user_permissions = get_user_permissions(user)
user_permission_doctypes = get_user_permission_doctypes(user_permission_doctypes, user_permissions)
@@ -258,6 +267,10 @@ def user_has_permission(doc, verbose=True, user=None, user_permission_doctypes=N
messages = {}
+ if not user_permission_doctypes:
+ # no doctypes restricted
+ end_result = True
+
# check multiple sets of user_permission_doctypes using OR condition
for doctypes in user_permission_doctypes:
result = True
@@ -309,9 +322,9 @@ def has_controller_permissions(doc, ptype, user=None):
def get_doctypes_with_read():
return list(set([p.parent for p in get_valid_perms()]))
-def get_valid_perms(doctype=None):
+def get_valid_perms(doctype=None, user=None):
'''Get valid permissions for the current user from DocPerm and Custom DocPerm'''
- roles = get_roles()
+ roles = get_roles(user)
perms = get_perms_for(roles)
custom_perms = get_perms_for(roles, 'Custom DocPerm')
@@ -360,7 +373,8 @@ def get_roles(user=None, with_standard=True):
def get_perms_for(roles, perm_doctype='DocPerm'):
'''Get perms for given roles'''
- return frappe.db.sql("""select * from `tab{doctype}` where docstatus=0
+ return frappe.db.sql("""
+ select * from `tab{doctype}` where docstatus=0
and ifnull(permlevel,0)=0
and role in ({roles})""".format(doctype = perm_doctype,
roles=", ".join(["%s"]*len(roles))), tuple(roles), as_dict=1)
@@ -386,22 +400,28 @@ def set_user_permission_if_allowed(doctype, name, user, with_message=False):
if get_role_permissions(frappe.get_meta(doctype), user).set_user_permissions!=1:
add_user_permission(doctype, name, user, with_message)
-def add_user_permission(doctype, name, user, with_message=False):
- '''Add user default'''
- if name not in frappe.defaults.get_user_permissions(user).get(doctype, []):
+def add_user_permission(doctype, name, user, apply=False):
+ '''Add user permission'''
+ from frappe.core.doctype.user_permission.user_permission import get_user_permissions
+ if name not in get_user_permissions(user).get(doctype, []):
if not frappe.db.exists(doctype, name):
frappe.throw(_("{0} {1} not found").format(_(doctype), name), frappe.DoesNotExistError)
- frappe.defaults.add_default(doctype, name, user, "User Permission")
- elif with_message:
- msgprint(_("Permission already set"))
+ frappe.get_doc(dict(
+ doctype='User Permission',
+ user=user,
+ allow=doctype,
+ for_value=name,
+ apply_for_all_roles=apply
+ )).insert()
-def remove_user_permission(doctype, name, user, default_value_name=None):
- frappe.defaults.clear_default(key=doctype, value=name, parent=user, parenttype="User Permission",
- name=default_value_name)
+def remove_user_permission(doctype, name, user):
+ user_permission_name = frappe.db.get_value('User Permission',
+ dict(user=user, allow=doctype, for_value=name))
+ frappe.delete_doc('User Permission', user_permission_name)
def clear_user_permissions_for_doctype(doctype):
- frappe.defaults.clear_default(parenttype="User Permission", key=doctype)
+ frappe.cache().delete_value('user_permissions')
def can_import(doctype, raise_exception=False):
if not ("System Manager" in frappe.get_roles() or has_permission(doctype, "import")):
@@ -426,9 +446,10 @@ def apply_user_permissions(doctype, ptype, user=None):
def get_user_permission_doctypes(user_permission_doctypes, user_permissions):
"""returns a list of list like [["User", "Blog Post"], ["User"]]"""
- if cint(frappe.db.get_single_value("System Settings", "ignore_user_permissions_if_missing")):
+ if cint(frappe.get_system_settings('ignore_user_permissions_if_missing')):
# select those user permission doctypes for which user permissions exist!
- user_permission_doctypes = [list(set(doctypes).intersection(set(user_permissions.keys())))
+ user_permission_doctypes = [
+ list(set(doctypes).intersection(set(user_permissions.keys())))
for doctypes in user_permission_doctypes]
if len(user_permission_doctypes) > 1:
@@ -452,6 +473,22 @@ def get_user_permission_doctypes(user_permission_doctypes, user_permissions):
return user_permission_doctypes
+def update_permission_property(doctype, role, permlevel, ptype, value=None, validate=True):
+ '''Update a property in Custom Perm'''
+ from frappe.core.doctype.doctype.doctype import validate_permissions_for_doctype
+ out = setup_custom_perms(doctype)
+
+ name = frappe.get_value('Custom DocPerm', dict(parent=doctype, role=role,
+ permlevel=permlevel))
+
+ frappe.db.sql("""
+ update `tabCustom DocPerm`
+ set `{0}`=%s where name=%s""".format(ptype), (value, name))
+ if validate:
+ validate_permissions_for_doctype(doctype)
+
+ return out
+
def setup_custom_perms(parent):
'''if custom permssions are not setup for the current doctype, set them up'''
if not frappe.db.exists('Custom DocPerm', dict(parent=parent)):
diff --git a/frappe/public/build.json b/frappe/public/build.json
index b350c8151a..054421286e 100755
--- a/frappe/public/build.json
+++ b/frappe/public/build.json
@@ -52,7 +52,8 @@
"public/css/desktop.css",
"public/css/form.css",
"public/css/mobile.css",
- "public/css/kanban.css"
+ "public/css/kanban.css",
+ "public/css/graphs.css"
],
"css/frappe-rtl.css": [
"public/css/bootstrap-rtl.css",
@@ -164,7 +165,7 @@
"public/js/frappe/query_string.js",
"public/js/frappe/ui/charts.js",
- "public/js/frappe/ui/graph.js",
+ "public/js/frappe/ui/graphs.js",
"public/js/frappe/ui/comment.js",
"public/js/frappe/misc/rating_icons.html",
diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css
index bfce576e37..22ecdb993b 100644
--- a/frappe/public/css/desk.css
+++ b/frappe/public/css/desk.css
@@ -258,7 +258,7 @@ a[disabled="disabled"]:hover {
}
.link-btn {
position: absolute;
- top: 2px;
+ top: 3px;
right: 4px;
border-radius: 2px;
padding: 3px;
diff --git a/frappe/public/css/docs.css b/frappe/public/css/docs.css
index 20b11d5cb1..2fdd0ae21d 100644
--- a/frappe/public/css/docs.css
+++ b/frappe/public/css/docs.css
@@ -597,9 +597,3 @@ a.edit:visited,
.page-content-wrapper > .row .col-sm-4 {
display: none;
}
-.screenshot {
- border: 2px solid #d1d8dd;
- box-shadow: 1px 1px 7px rgba(0, 0, 0, 0.15);
- margin: 15px 0px;
- max-width: 100%;
-}
diff --git a/frappe/public/css/form.css b/frappe/public/css/form.css
index 0d21271862..c56811e892 100644
--- a/frappe/public/css/form.css
+++ b/frappe/public/css/form.css
@@ -678,80 +678,6 @@ select.form-control {
padding: 10px;
margin: 10px;
}
-.graph-container .graphics {
- margin-top: 10px;
- padding: 10px 0px;
-}
-.graph-container .stats-group {
- display: flex;
- justify-content: space-around;
- flex: 1;
-}
-.graph-container .stats-container {
- display: flex;
- justify-content: space-around;
-}
-.graph-container .stats-container .stats {
- padding-bottom: 15px;
-}
-.graph-container .stats-container .stats-title {
- color: #8D99A6;
-}
-.graph-container .stats-container .stats-value {
- font-size: 20px;
- font-weight: 300;
-}
-.graph-container .stats-container .stats-description {
- font-size: 12px;
- color: #8D99A6;
-}
-.graph-container .stats-container .graph-data .stats-value {
- color: #98d85b;
-}
-.bar-graph .axis,
-.line-graph .axis {
- font-size: 10px;
- fill: #6a737d;
-}
-.bar-graph .axis line,
-.line-graph .axis line {
- stroke: rgba(27, 31, 35, 0.1);
-}
-.data-points circle {
- fill: #28a745;
- stroke: #fff;
- stroke-width: 2;
-}
-.data-points g.mini {
- fill: #98d85b;
-}
-.data-points path {
- fill: none;
- stroke: #28a745;
- stroke-opacity: 1;
- stroke-width: 2px;
-}
-.line-graph .path {
- fill: none;
- stroke: #28a745;
- stroke-opacity: 1;
- stroke-width: 2px;
-}
-line.dashed {
- stroke-dasharray: 5,3;
-}
-.tick.x-axis-label {
- display: block;
-}
-.tick .specific-value {
- text-anchor: start;
-}
-.tick .y-value-text {
- text-anchor: end;
-}
-.tick .x-value-text {
- text-anchor: middle;
-}
body[data-route^="Form/Communication"] textarea[data-fieldname="subject"] {
height: 80px !important;
}
diff --git a/frappe/public/css/graphs.css b/frappe/public/css/graphs.css
new file mode 100644
index 0000000000..a9fdf62dc9
--- /dev/null
+++ b/frappe/public/css/graphs.css
@@ -0,0 +1,274 @@
+/* graphs */
+.graph-container .graph-focus-margin {
+ margin: 0px 5%;
+}
+.graph-container .graph-graphics {
+ margin-top: 10px;
+ padding: 10px 0px;
+ position: relative;
+}
+.graph-container .graph-stats-group {
+ display: flex;
+ justify-content: space-around;
+ flex: 1;
+}
+.graph-container .graph-stats-container {
+ display: flex;
+ justify-content: space-around;
+ padding-top: 10px;
+}
+.graph-container .graph-stats-container .stats {
+ padding-bottom: 15px;
+}
+.graph-container .graph-stats-container .stats-title {
+ color: #8D99A6;
+}
+.graph-container .graph-stats-container .stats-value {
+ font-size: 20px;
+ font-weight: 300;
+}
+.graph-container .graph-stats-container .stats-description {
+ font-size: 12px;
+ color: #8D99A6;
+}
+.graph-container .graph-stats-container .graph-data .stats-value {
+ color: #98d85b;
+}
+.graph-container .bar-graph .axis,
+.graph-container .line-graph .axis {
+ font-size: 10px;
+ fill: #6a737d;
+}
+.graph-container .bar-graph .axis line,
+.graph-container .line-graph .axis line {
+ stroke: rgba(27, 31, 35, 0.1);
+}
+.graph-container .percentage-graph {
+ margin-top: 35px;
+}
+.graph-container .percentage-graph .progress {
+ margin-bottom: 0px;
+}
+.graph-container .graph-data-points circle {
+ stroke: #fff;
+ stroke-width: 2;
+}
+.graph-container .graph-data-points path {
+ fill: none;
+ stroke-opacity: 1;
+ stroke-width: 2px;
+}
+.graph-container line.graph-dashed {
+ stroke-dasharray: 5,3;
+}
+.graph-container .tick.x-axis-label {
+ display: block;
+}
+.graph-container .tick .specific-value {
+ text-anchor: start;
+}
+.graph-container .tick .y-value-text {
+ text-anchor: end;
+}
+.graph-container .tick .x-value-text {
+ text-anchor: middle;
+}
+.graph-container .graph-svg-tip {
+ position: absolute;
+ z-index: 99999;
+ padding: 10px;
+ font-size: 12px;
+ color: #959da5;
+ text-align: center;
+ background: rgba(0, 0, 0, 0.8);
+ border-radius: 3px;
+}
+.graph-container .graph-svg-tip.comparison {
+ padding: 0;
+ text-align: left;
+ pointer-events: none;
+}
+.graph-container .graph-svg-tip.comparison .title {
+ display: block;
+ padding: 10px;
+ margin: 0;
+ font-weight: 600;
+ line-height: 1;
+ pointer-events: none;
+}
+.graph-container .graph-svg-tip.comparison ul {
+ margin: 0;
+ white-space: nowrap;
+ list-style: none;
+}
+.graph-container .graph-svg-tip.comparison li {
+ display: inline-block;
+ padding: 5px 10px;
+}
+.graph-container .graph-svg-tip ul,
+.graph-container .graph-svg-tip ol {
+ padding-left: 0;
+ display: flex;
+}
+.graph-container .graph-svg-tip ul.data-point-list li {
+ min-width: 90px;
+ flex: 1;
+}
+.graph-container .graph-svg-tip strong {
+ color: #dfe2e5;
+}
+.graph-container .graph-svg-tip::after {
+ position: absolute;
+ bottom: -10px;
+ left: 50%;
+ width: 5px;
+ height: 5px;
+ margin: 0 0 0 -5px;
+ content: " ";
+ border: 5px solid transparent;
+ border-top-color: rgba(0, 0, 0, 0.8);
+}
+.graph-container .stroke.grey {
+ stroke: #F0F4F7;
+}
+.graph-container .stroke.blue {
+ stroke: #5e64ff;
+}
+.graph-container .stroke.red {
+ stroke: #ff5858;
+}
+.graph-container .stroke.light-green {
+ stroke: #98d85b;
+}
+.graph-container .stroke.green {
+ stroke: #28a745;
+}
+.graph-container .stroke.orange {
+ stroke: #ffa00a;
+}
+.graph-container .stroke.purple {
+ stroke: #743ee2;
+}
+.graph-container .stroke.darkgrey {
+ stroke: #b8c2cc;
+}
+.graph-container .stroke.black {
+ stroke: #36414C;
+}
+.graph-container .stroke.yellow {
+ stroke: #FEEF72;
+}
+.graph-container .stroke.light-blue {
+ stroke: #7CD6FD;
+}
+.graph-container .stroke.lightblue {
+ stroke: #7CD6FD;
+}
+.graph-container .fill.grey {
+ fill: #F0F4F7;
+}
+.graph-container .fill.blue {
+ fill: #5e64ff;
+}
+.graph-container .fill.red {
+ fill: #ff5858;
+}
+.graph-container .fill.light-green {
+ fill: #98d85b;
+}
+.graph-container .fill.green {
+ fill: #28a745;
+}
+.graph-container .fill.orange {
+ fill: #ffa00a;
+}
+.graph-container .fill.purple {
+ fill: #743ee2;
+}
+.graph-container .fill.darkgrey {
+ fill: #b8c2cc;
+}
+.graph-container .fill.black {
+ fill: #36414C;
+}
+.graph-container .fill.yellow {
+ fill: #FEEF72;
+}
+.graph-container .fill.light-blue {
+ fill: #7CD6FD;
+}
+.graph-container .fill.lightblue {
+ fill: #7CD6FD;
+}
+.graph-container .background.grey {
+ background: #F0F4F7;
+}
+.graph-container .background.blue {
+ background: #5e64ff;
+}
+.graph-container .background.red {
+ background: #ff5858;
+}
+.graph-container .background.light-green {
+ background: #98d85b;
+}
+.graph-container .background.green {
+ background: #28a745;
+}
+.graph-container .background.orange {
+ background: #ffa00a;
+}
+.graph-container .background.purple {
+ background: #743ee2;
+}
+.graph-container .background.darkgrey {
+ background: #b8c2cc;
+}
+.graph-container .background.black {
+ background: #36414C;
+}
+.graph-container .background.yellow {
+ background: #FEEF72;
+}
+.graph-container .background.light-blue {
+ background: #7CD6FD;
+}
+.graph-container .background.lightblue {
+ background: #7CD6FD;
+}
+.graph-container .border-top.grey {
+ border-top: 3px solid #F0F4F7;
+}
+.graph-container .border-top.blue {
+ border-top: 3px solid #5e64ff;
+}
+.graph-container .border-top.red {
+ border-top: 3px solid #ff5858;
+}
+.graph-container .border-top.light-green {
+ border-top: 3px solid #98d85b;
+}
+.graph-container .border-top.green {
+ border-top: 3px solid #28a745;
+}
+.graph-container .border-top.orange {
+ border-top: 3px solid #ffa00a;
+}
+.graph-container .border-top.purple {
+ border-top: 3px solid #743ee2;
+}
+.graph-container .border-top.darkgrey {
+ border-top: 3px solid #b8c2cc;
+}
+.graph-container .border-top.black {
+ border-top: 3px solid #36414C;
+}
+.graph-container .border-top.yellow {
+ border-top: 3px solid #FEEF72;
+}
+.graph-container .border-top.light-blue {
+ border-top: 3px solid #7CD6FD;
+}
+.graph-container .border-top.lightblue {
+ border-top: 3px solid #7CD6FD;
+}
diff --git a/frappe/public/css/website.css b/frappe/public/css/website.css
index 9a92bccf38..b9b2d733bb 100644
--- a/frappe/public/css/website.css
+++ b/frappe/public/css/website.css
@@ -430,6 +430,9 @@ h6 a {
color: inherit !important;
text-decoration: none;
}
+li {
+ line-height: 1.7em;
+}
.navbar-brand {
max-width: none;
}
@@ -503,6 +506,9 @@ h6 a {
min-height: 140px;
border-top: 1px solid #EBEFF2;
}
+.page_content {
+ padding-bottom: 30px;
+}
.carousel-control .icon {
position: absolute;
top: 50%;
@@ -599,7 +605,7 @@ fieldset {
}
.web-sidebar .sidebar-item {
margin: 0px;
- padding: 12px 0px;
+ padding-bottom: 12px;
border: none;
color: #8D99A6;
font-size: 12px;
@@ -607,21 +613,14 @@ fieldset {
.web-sidebar .sidebar-item .badge {
font-weight: normal;
}
-.web-sidebar .sidebar-item:first-child {
- padding-top: 10px;
-}
-.web-sidebar .sidebar-item:last-child {
- padding-bottom: 10px;
-}
.web-sidebar .sidebar-item a {
- color: #8D99A6;
+ color: #36414C !important;
}
.web-sidebar .sidebar-item a.active {
color: #36414C !important;
font-weight: 500 !important;
}
.web-sidebar .sidebar-items {
- margin-top: -10px;
margin-bottom: 30px;
}
.web-sidebar .sidebar-items .title {
@@ -675,69 +674,25 @@ fieldset {
.web-list-item:last-child {
border-bottom: 0px;
}
-.blog-info {
- text-align: center;
- margin-top: 30px;
-}
-.post-description {
- padding-bottom: 8px;
-}
-.post-description p {
- margin-bottom: 8px;
-}
-.blog-footer {
- padding: 5px 15px;
- border-top: 1px solid #EBEFF2;
- margin: 0px -15px -20px -15px;
-}
-.blog-list-content .website-list .result {
+.website-list .result {
border: 0px;
}
-.blog-list-content .web-list-item:hover {
+.web-list-item:hover {
background: transparent;
}
-.blog-category {
- letter-spacing: 0.5px;
- text-align: center;
- margin-bottom: 30px;
-}
-.author {
- letter-spacing: 0.5px;
- border-bottom: 1px solid #EBEFF2;
- padding-bottom: 30px;
-}
-.blogger {
- padding-top: 0px;
- padding-bottom: 50px;
-}
-.blog-dot:before {
+.spacer-dot:before {
padding-right: 8px;
padding-left: 8px;
content: "\2022";
}
-.blog-list-item {
- margin-top: 30px;
- margin-bottom: 30px;
-}
-.blog-list-item .blog-header {
- font-size: 1.6em;
-}
-.blog-header {
- font-weight: 700;
- font-size: 2em;
-}
.add-comment-section {
padding-bottom: 30px;
}
-.blog-comments {
- position: relative;
- border-top: 1px solid #d1d8dd;
-}
-.blog-comment-row {
+.comment-row {
margin: 0px -15px;
padding: 15px;
}
-.blog-comment-row:last-child {
+.comment-row:last-child {
margin-bottom: 30px;
border-bottom: 0px;
}
@@ -837,7 +792,7 @@ a.active {
}
.sidebar-block,
.page-content {
- padding-top: 50px;
+ padding-top: 30px;
padding-bottom: 50px;
}
.your-account-info {
@@ -871,19 +826,6 @@ a.active {
li.footer-child-item {
margin: 15px 0px;
}
-.blog-info {
- text-align: center;
- margin-top: 30px;
-}
-.blog-text {
- padding-top: 50px;
- padding-bottom: 50px;
- font-size: 18px;
- line-height: 1.5;
-}
-.blog-text p {
- margin-bottom: 30px;
-}
.comment-view {
padding-bottom: 30px;
}
@@ -927,7 +869,7 @@ li.footer-child-item {
overflow: hidden;
}
.vert-line > div + div {
- border-left: 1px solid #EBEFF2;
+ border-left: 1px solid #d1d8dd;
}
.vert-line > div {
padding-bottom: 2000px;
@@ -994,3 +936,13 @@ li.footer-child-item {
padding: 10px;
border-radius: 4px;
}
+.docfields pre {
+ background-color: transparent;
+ border: none;
+}
+.screenshot {
+ border: 1px solid #d1d8dd;
+ box-shadow: 1px 1px 7px rgba(0, 0, 0, 0.15);
+ margin: 15px 0px;
+ max-width: 100%;
+}
diff --git a/frappe/public/js/frappe/defaults.js b/frappe/public/js/frappe/defaults.js
index 24ba5e630e..570ae61e2a 100644
--- a/frappe/public/js/frappe/defaults.js
+++ b/frappe/public/js/frappe/defaults.js
@@ -77,10 +77,6 @@ frappe.defaults = {
},
get_user_permissions: function() {
- return frappe.defaults.user_permissions;
+ return frappe.boot.user_permissions;
},
- set_user_permissions: function(user_permissions) {
- if(!user_permissions) return;
- frappe.defaults.user_permissions = $.extend(frappe.defaults.user_permissions || {}, user_permissions);
- }
}
diff --git a/frappe/public/js/frappe/form/dashboard.js b/frappe/public/js/frappe/form/dashboard.js
index d27aa619e0..ca2b4ab9bd 100644
--- a/frappe/public/js/frappe/form/dashboard.js
+++ b/frappe/public/js/frappe/form/dashboard.js
@@ -418,9 +418,8 @@ frappe.ui.form.Dashboard = Class.extend({
this.graph_area.empty().removeClass('hidden');
$.extend(args, {
parent: me.graph_area,
- width: 710,
- height: 140,
- mode: 'line-graph'
+ mode: 'line',
+ height: 140
});
new frappe.ui.Graph(args);
diff --git a/frappe/public/js/frappe/list/list_renderer.js b/frappe/public/js/frappe/list/list_renderer.js
index 1a6b6aa07c..1ec5b3e37e 100644
--- a/frappe/public/js/frappe/list/list_renderer.js
+++ b/frappe/public/js/frappe/list/list_renderer.js
@@ -271,7 +271,10 @@ frappe.views.ListRenderer = Class.extend({
setup_filterable: function () {
var me = this;
+
+ this.list_view.wrapper &&
this.list_view.wrapper.on('click', '.result-list .filterable', function (e) {
+ e.stopPropagation();
var filters = $(this).attr('data-filter').split('|');
var added = false;
@@ -294,7 +297,9 @@ frappe.views.ListRenderer = Class.extend({
me.list_view.refresh(true);
}
});
- this.wrapper.on('click', '.list-item', function (e) {
+
+ this.list_view.wrapper &&
+ this.list_view.wrapper.on('click', '.list-item', function (e) {
// don't open in case of checkbox, like, filterable
if ($(e.target).hasClass('filterable')
|| $(e.target).hasClass('octicon-heart')
diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index 05facf346d..a7024a9fb7 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -599,9 +599,9 @@ frappe.views.ListView = frappe.ui.BaseList.extend({
}, true);
}
if (frappe.model.can_set_user_permissions(this.doctype)) {
- this.page.add_menu_item(__('User Permissions Manager'), function () {
- frappe.set_route('user-permissions', {
- doctype: me.doctype
+ this.page.add_menu_item(__('User Permissions'), function () {
+ frappe.set_route('List', 'User Permission', {
+ allow: me.doctype
});
}, true);
}
diff --git a/frappe/public/js/frappe/model/create_new.js b/frappe/public/js/frappe/model/create_new.js
index 04496c6238..a25c3e70ca 100644
--- a/frappe/public/js/frappe/model/create_new.js
+++ b/frappe/public/js/frappe/model/create_new.js
@@ -127,8 +127,10 @@ $.extend(frappe.model, {
var user_default = "";
var user_permissions = frappe.defaults.get_user_permissions();
var meta = frappe.get_meta(doc.doctype);
- var has_user_permissions = (df.fieldtype==="Link" && user_permissions
- && df.ignore_user_permissions != 1 && user_permissions[df.options]);
+ var has_user_permissions = (df.fieldtype==="Link"
+ && user_permissions
+ && df.ignore_user_permissions != 1
+ && user_permissions[df.options]);
// don't set defaults for "User" link field using User Permissions!
if (df.fieldtype==="Link" && df.options!=="User") {
diff --git a/frappe/public/js/frappe/model/model.js b/frappe/public/js/frappe/model/model.js
index adb2e845a6..7b22c5fd47 100644
--- a/frappe/public/js/frappe/model/model.js
+++ b/frappe/public/js/frappe/model/model.js
@@ -112,7 +112,6 @@ $.extend(frappe.model, {
localStorage["_doctype:" + doctype] = JSON.stringify(r.docs);
}
frappe.model.init_doctype(doctype);
- frappe.defaults.set_user_permissions(r.user_permissions);
if(r.user_settings) {
// remember filters and other settings from last view
diff --git a/frappe/public/js/frappe/ui/filters/filters.js b/frappe/public/js/frappe/ui/filters/filters.js
index b338d23f3d..0d74e61b84 100644
--- a/frappe/public/js/frappe/ui/filters/filters.js
+++ b/frappe/public/js/frappe/ui/filters/filters.js
@@ -87,6 +87,7 @@ frappe.ui.FilterList = Class.extend({
}
var filter = this.push_new_filter(doctype, fieldname, condition, value);
+ if (!filter) return;
if(this.wrapper.find('.clear-filters').hasClass("hide")) {
this.wrapper.find('.clear-filters').removeClass("hide");
diff --git a/frappe/public/js/frappe/ui/graph.js b/frappe/public/js/frappe/ui/graph.js
deleted file mode 100644
index 2347f13b0d..0000000000
--- a/frappe/public/js/frappe/ui/graph.js
+++ /dev/null
@@ -1,308 +0,0 @@
-// specific_values = [
-// {
-// name: "Average",
-// line_type: "dashed", // "dashed" or "solid"
-// value: 10
-// },
-
-// summary_values = [
-// {
-// name: "Total",
-// color: 'blue', // Indicator colors: 'grey', 'blue', 'red', 'green', 'orange',
-// // 'purple', 'darkgrey', 'black', 'yellow', 'lightblue'
-// value: 80
-// }
-// ]
-
-frappe.ui.Graph = class Graph {
- constructor({
- parent = null,
-
- width = 0, height = 0,
- title = '', subtitle = '',
-
- y_values = [],
- x_points = [],
-
- specific_values = [],
- summary_values = [],
-
- color = '',
- mode = '',
- } = {}) {
-
- if(Object.getPrototypeOf(this) === frappe.ui.Graph.prototype) {
- if(mode === 'line-graph') {
- return new frappe.ui.LineGraph(arguments[0]);
- } else if(mode === 'bar-graph') {
- return new frappe.ui.BarGraph(arguments[0]);
- }
- }
-
- this.parent = parent;
-
- this.width = width;
- this.height = height;
-
- this.title = title;
- this.subtitle = subtitle;
-
- this.y_values = y_values;
- this.x_points = x_points;
-
- this.specific_values = specific_values;
- this.summary_values = summary_values;
-
- this.color = color;
- this.mode = mode;
-
- this.$graph = null;
-
- frappe.require("assets/frappe/js/lib/snap.svg-min.js", this.setup.bind(this));
- }
-
- setup() {
- this.setup_container();
- this.refresh();
- }
-
- refresh() {
- this.setup_values();
- this.setup_components();
- this.make_y_axis();
- this.make_x_axis();
- this.make_units();
- if(this.specific_values.length > 0) {
- this.show_specific_values();
- }
- this.setup_group();
-
- if(this.summary_values.length > 0) {
- this.show_summary();
- }
- }
-
- setup_container() {
- this.container = $('| + | App Name |
@@ -37,10 +37,10 @@
Contentsdiff --git a/frappe/templates/autodoc/docs_home.html b/frappe/templates/autodoc/docs_home.html index 602c9fb5b0..9d38b0605b 100644 --- a/frappe/templates/autodoc/docs_home.html +++ b/frappe/templates/autodoc/docs_home.html @@ -5,57 +5,15 @@ {% if app.style %} {{ app.style }} {% endif %} - -
-
-
-
-{% if app.long_description %}
-
-
-
-
-
-
- {{ app.headline }}-{{ app.sub_heading }} -
-
-
-
-
-
-
+{% if app.headline %}
+
-
-
- {{ app.long_description|markdown }}
-
- {{ app.headline }}+{% endif %} +{% if app.sub_heading %} +{{ app.sub_heading }}{% endif %} -{% if not app.hide_install %} -
-
+{% if app.long_description %}
+{{ app.long_description|markdown }}
{% endif %}
diff --git a/frappe/templates/autodoc/doctype.html b/frappe/templates/autodoc/doctype.html
index 3236f0c994..b851fc52e8 100644
--- a/frappe/templates/autodoc/doctype.html
+++ b/frappe/templates/autodoc/doctype.html
@@ -1,10 +1,12 @@
+
{% from "templates/autodoc/macros.html" import automodule, version,
source_link, doctype_link %}
{% set doc = frappe.get_doc("DocType", doctype) %}
{% set controller = autodoc.get_controller(doctype) %}
+
-
-
-
- Install-From your site-To install this app, login to your site and click on "Installer". Search for {{ app.title }} and click on "Install" -Using Bench-Go to your bench folder and setup the new app -Login to your site to configure the app. - -
-
- Author- -{{ app.publisher }} ({{ app.email }}) -{{ doctype }}
{{ version(doctype) }}
{{ source_link(app, app.name + "/" + scrub(doc.module)
@@ -22,7 +24,7 @@
Fields-
|
{% for item in children_map[route] %}-
- {{ item.title }}
+ {{ item.title }}
+ {#
{% if children_map[item.route] %}
{{ make_item_list(item.route, children_map) }}
{% endif %}
+ #}
{% endfor %}
diff --git a/frappe/templates/includes/web_sidebar.html b/frappe/templates/includes/web_sidebar.html index 764ce4d277..d452e8af3f 100644 --- a/frappe/templates/includes/web_sidebar.html +++ b/frappe/templates/includes/web_sidebar.html @@ -22,7 +22,7 @@ {% endif %} {% for item in sidebar_items -%}