+{{ version(doctype) }}
+{{ github_link(app, app.name + "/" + scrub(doc.module)
+ + "/doctype/" + scrub(doctype), True) }}
+
{% if doc.issingle %}
+{{ version(app.name) }}
+{{ github_link(app, app.name + "/" + scrub(name), True) }}
+
+
+
+{{ version(app.name) }}
+{{ github_link(app, name.replace(".", "/") + ".py") }}
+
+
+{{ automodule(name) }}
+
+{{ discuss_link() }}
diff --git a/frappe/templates/base.html b/frappe/templates/base.html
index c02a063309..2b301ec723 100644
--- a/frappe/templates/base.html
+++ b/frappe/templates/base.html
@@ -44,7 +44,7 @@
{% endif -%}
-
+
diff --git a/frappe/templates/includes/list/list.html b/frappe/templates/includes/list/list.html
index 6e14df3cf7..907120155d 100644
--- a/frappe/templates/includes/list/list.html
+++ b/frappe/templates/includes/list/list.html
@@ -19,3 +19,4 @@
{%- endif %}
+
diff --git a/frappe/tests/test_permissions.py b/frappe/tests/test_permissions.py
new file mode 100644
index 0000000000..88757dd167
--- /dev/null
+++ b/frappe/tests/test_permissions.py
@@ -0,0 +1,229 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# MIT License. See license.txt
+from __future__ import unicode_literals
+
+"""Use blog post test to test user permissions logic"""
+
+import frappe
+import frappe.defaults
+import unittest
+import json
+import frappe.model.meta
+from frappe.core.page.user_permissions.user_permissions import add, remove, get_permissions
+from frappe.permissions import clear_user_permissions_for_doctype, get_doc_permissions
+
+test_records = frappe.get_test_records('Blog Post')
+
+test_dependencies = ["User"]
+
+class TestPermissions(unittest.TestCase):
+ def setUp(self):
+ frappe.clear_cache(doctype="Blog Post")
+
+ user = frappe.get_doc("User", "test1@example.com")
+ user.add_roles("Website Manager")
+
+ user = frappe.get_doc("User", "test2@example.com")
+ user.add_roles("Blogger")
+
+ frappe.set_user("test1@example.com")
+
+ def tearDown(self):
+ frappe.set_user("Administrator")
+ frappe.db.set_value("Blogger", "_Test Blogger 1", "user", None)
+
+ clear_user_permissions_for_doctype("Blog Category")
+ clear_user_permissions_for_doctype("Blog Post")
+ clear_user_permissions_for_doctype("Blogger")
+
+ frappe.db.sql("""update `tabDocPerm` set user_permission_doctypes=null
+ where parent='Blog Post' and permlevel=0 and apply_user_permissions=1
+ and `read`=1""")
+
+ frappe.db.sql("""update `tabDocPerm` set if_owner=0
+ where parent='Blog Post' and permlevel=0 and permlevel=0 and role='Blogger'""")
+
+ def test_basic_permission(self):
+ post = frappe.get_doc("Blog Post", "_test-blog-post")
+ self.assertTrue(post.has_permission("read"))
+
+ def test_user_permissions_in_doc(self):
+ frappe.permissions.add_user_permission("Blog Category", "_Test Blog Category 1",
+ "test2@example.com")
+
+ frappe.set_user("test2@example.com")
+
+ post = frappe.get_doc("Blog Post", "_test-blog-post")
+ self.assertFalse(post.has_permission("read"))
+ self.assertFalse(get_doc_permissions(post).get("read"))
+
+ post1 = frappe.get_doc("Blog Post", "_test-blog-post-1")
+ self.assertTrue(post1.has_permission("read"))
+ self.assertTrue(get_doc_permissions(post1).get("read"))
+
+ def test_user_permissions_in_report(self):
+ frappe.permissions.add_user_permission("Blog Category", "_Test Blog Category 1", "test2@example.com")
+
+ frappe.set_user("test2@example.com")
+ names = [d.name for d in frappe.get_list("Blog Post", fields=["name", "blog_category"])]
+
+ self.assertTrue("_test-blog-post-1" in names)
+ self.assertFalse("_test-blog-post" in names)
+
+ def test_default_values(self):
+ frappe.permissions.add_user_permission("Blog Category", "_Test Blog Category 1", "test2@example.com")
+
+ frappe.set_user("test2@example.com")
+ doc = frappe.new_doc("Blog Post")
+ self.assertEquals(doc.get("blog_category"), "_Test Blog Category 1")
+
+ def test_user_link_match_doc(self):
+ blogger = frappe.get_doc("Blogger", "_Test Blogger 1")
+ blogger.user = "test2@example.com"
+ blogger.save()
+
+ frappe.set_user("test2@example.com")
+
+ post = frappe.get_doc("Blog Post", "_test-blog-post-2")
+ self.assertTrue(post.has_permission("read"))
+
+ post1 = frappe.get_doc("Blog Post", "_test-blog-post-1")
+ self.assertFalse(post1.has_permission("read"))
+
+ def test_user_link_match_report(self):
+ blogger = frappe.get_doc("Blogger", "_Test Blogger 1")
+ blogger.user = "test2@example.com"
+ blogger.save()
+
+ frappe.set_user("test2@example.com")
+
+ names = [d.name for d in frappe.get_list("Blog Post", fields=["name", "owner"])]
+ self.assertTrue("_test-blog-post-2" in names)
+ self.assertFalse("_test-blog-post-1" in names)
+
+ def test_set_user_permissions(self):
+ frappe.set_user("test1@example.com")
+ add("test2@example.com", "Blog Post", "_test-blog-post")
+
+ def test_not_allowed_to_set_user_permissions(self):
+ frappe.set_user("test2@example.com")
+
+ # this user can't add user permissions
+ self.assertRaises(frappe.PermissionError, add,
+ "test2@example.com", "Blog Post", "_test-blog-post")
+
+ def test_read_if_explicit_user_permissions_are_set(self):
+ self.test_set_user_permissions()
+
+ frappe.set_user("test2@example.com")
+
+ # user can only access permitted blog post
+ doc = frappe.get_doc("Blog Post", "_test-blog-post")
+ self.assertTrue(doc.has_permission("read"))
+
+ # and not this one
+ doc = frappe.get_doc("Blog Post", "_test-blog-post-1")
+ self.assertFalse(doc.has_permission("read"))
+
+ def test_not_allowed_to_remove_user_permissions(self):
+ self.test_set_user_permissions()
+ defname = get_permissions("test2@example.com", "Blog Post", "_test-blog-post")[0].name
+
+ frappe.set_user("test2@example.com")
+
+ # user cannot remove their own user permissions
+ self.assertRaises(frappe.PermissionError, remove,
+ "test2@example.com", defname, "Blog Post", "_test-blog-post")
+
+ def test_user_permissions_based_on_blogger(self):
+ frappe.set_user("test2@example.com")
+ doc = frappe.get_doc("Blog Post", "_test-blog-post-1")
+ self.assertTrue(doc.has_permission("read"))
+
+ frappe.set_user("test1@example.com")
+ add("test2@example.com", "Blog Post", "_test-blog-post")
+
+ frappe.set_user("test2@example.com")
+ doc = frappe.get_doc("Blog Post", "_test-blog-post-1")
+ self.assertFalse(doc.has_permission("read"))
+
+ doc = frappe.get_doc("Blog Post", "_test-blog-post")
+ self.assertTrue(doc.has_permission("read"))
+
+ def test_set_only_once(self):
+ blog_post = frappe.get_meta("Blog Post")
+ blog_post.get_field("title").set_only_once = 1
+ doc = frappe.get_doc("Blog Post", "_test-blog-post-1")
+ doc.title = "New"
+ self.assertRaises(frappe.CannotChangeConstantError, doc.save)
+ blog_post.get_field("title").set_only_once = 0
+
+ def test_user_permission_doctypes(self):
+ frappe.permissions.add_user_permission("Blog Category", "_Test Blog Category 1",
+ "test2@example.com")
+ frappe.permissions.add_user_permission("Blogger", "_Test Blogger 1",
+ "test2@example.com")
+
+ frappe.set_user("test2@example.com")
+
+ frappe.db.sql("""update `tabDocPerm` set user_permission_doctypes=%s
+ where parent='Blog Post' and permlevel=0 and apply_user_permissions=1
+ and `read`=1""", json.dumps(["Blogger"]))
+
+ frappe.model.meta.clear_cache("Blog Post")
+
+ doc = frappe.get_doc("Blog Post", "_test-blog-post")
+ self.assertFalse(doc.has_permission("read"))
+
+ doc = frappe.get_doc("Blog Post", "_test-blog-post-2")
+ self.assertTrue(doc.has_permission("read"))
+
+ frappe.model.meta.clear_cache("Blog Post")
+
+ def if_owner_setup(self):
+ frappe.db.sql("""update `tabDocPerm` set if_owner=1
+ where parent='Blog Post' and permlevel=0 and permlevel=0 and role='Blogger'""")
+
+ frappe.permissions.add_user_permission("Blog Category", "_Test Blog Category 1",
+ "test2@example.com")
+ frappe.permissions.add_user_permission("Blogger", "_Test Blogger 1",
+ "test2@example.com")
+
+ frappe.db.sql("""update `tabDocPerm` set user_permission_doctypes=%s
+ where parent='Blog Post' and permlevel=0 and apply_user_permissions=1
+ and `read`=1""", json.dumps(["Blog Category"]))
+
+ frappe.model.meta.clear_cache("Blog Post")
+
+ def test_insert_if_owner_with_user_permissions(self):
+ """If `If Owner` is checked for a Role, check if that document is allowed to be read, updated, submitted, etc. except be created, even if the document is restricted based on User Permissions."""
+ self.if_owner_setup()
+
+ frappe.set_user("test2@example.com")
+
+ doc = frappe.get_doc({
+ "doctype": "Blog Post",
+ "blog_category": "_Test Blog Category",
+ "blogger": "_Test Blogger 1",
+ "title": "_Test Blog Post Title",
+ "content": "_Test Blog Post Content"
+ })
+
+ self.assertRaises(frappe.PermissionError, doc.insert)
+
+ frappe.set_user("Administrator")
+ frappe.permissions.add_user_permission("Blog Category", "_Test Blog Category",
+ "test2@example.com")
+
+ frappe.set_user("test2@example.com")
+ doc.insert()
+
+ frappe.set_user("Administrator")
+ frappe.permissions.remove_user_permission("Blog Category", "_Test Blog Category",
+ "test2@example.com")
+
+ frappe.set_user("test2@example.com")
+ doc = frappe.get_doc(doc.doctype, doc.name)
+ self.assertTrue(doc.has_permission("read"))
+ self.assertTrue(doc.has_permission("write"))
+ self.assertFalse(doc.has_permission("create"))
diff --git a/frappe/utils/autodoc.py b/frappe/utils/autodoc.py
index 831feabf0e..70f6ee588d 100644
--- a/frappe/utils/autodoc.py
+++ b/frappe/utils/autodoc.py
@@ -8,50 +8,9 @@ frappe.utils.autodoc
Inspect elements of a given module and return its objects
"""
-import inspect, importlib, re, frappe, os, shutil
+import inspect, importlib, re, frappe
from frappe.model.document import get_controller
-from markdown2 import markdown
-def build(app):
- app_path = frappe.get_app_path(app)
- source = frappe.get_app_path(app, "src")
- dest = frappe.get_app_path(app, "www")
- for basepath, folders, files in os.walk(source):
- destpath = os.path.join(dest, os.path.relpath(basepath, source))
-
- # make target dir if missing
- if not os.path.exists(destpath):
- os.makedirs(destpath)
-
- # delete removed folders in source from dest
- for destfolder in os.listdir(destpath):
- if os.path.isdir(os.path.join(destpath, destfolder)):
- if destfolder not in folders:
- os.path.join(destpath, destfolder)
- shutil.rmtree(os.path.join(destpath, destfolder))
-
- for fname in files:
- # delete file
- if os.path.exists(os.path.join(destpath, fname)):
- os.remove(os.path.join(destpath, fname))
-
- print fname
- if fname.rsplit(".", 1)[-1] in ("md", "html"):
- # render template and build file
- with open(os.path.join(destpath, fname.rsplit(".", 1)[0] + ".html"), "w") as destfile:
- if fname.endswith(".md"):
- # convert markdown to html before rendering
- with open(os.path.join(basepath, fname), "r") as template_file:
- template = markdown(template_file.read())
- html = frappe.render_template(template, {}).encode("utf-8")
- destfile.write(html)
- else:
- template_path = os.path.relpath(os.path.join(basepath, fname), app_path)
- html = frappe.render_template(template_path, {}, is_path=True).encode("utf-8")
- destfile.write(html)
- else:
- # not a template, copy
- shutil.copyfile(os.path.join(basepath, fname), os.path.join(destpath, fname))
def automodule(name):
"""Returns a list of attributes for given module string.
@@ -85,16 +44,22 @@ def automodule(name):
"members": filter(None, attributes),
}
+installed = None
def get_version(name):
+ print name
+ global installed
+
+ if not installed:
+ installed = frappe.get_installed_apps()
+
def _for_module(m):
return importlib.import_module(m.split(".")[0]).__version__
- if "." in name or name=="frappe":
+ if "." in name or name in installed:
return _for_module(name)
else:
return _for_module(get_controller(name).__module__)
-
def get_class_info(class_obj, module_name):
members = []
for attrname in dir(class_obj):
@@ -117,15 +82,14 @@ def get_class_info(class_obj, module_name):
}
def get_function_info(value):
- docs = getattr(value, "__doc__", "")
- if docs:
- return {
- "name": value.__name__,
- "type": "function",
- "args": inspect.getargspec(value),
- "docs": parse(docs),
- "whitelisted": value in frappe.whitelisted
- }
+ docs = getattr(value, "__doc__")
+ return {
+ "name": value.__name__,
+ "type": "function",
+ "args": inspect.getargspec(value),
+ "docs": parse(docs) if docs else '
No docs',
+ "whitelisted": value in frappe.whitelisted
+ }
def parse(docs):
"""Parse __docs__ text into markdown. Will parse directives like `:param name:` etc"""
@@ -179,17 +143,3 @@ def strip_leading_tabs(docs):
def automodel(doctype):
"""return doctype template"""
pass
-
-def get_doclink(name):
- """Returns `__doclink__` property of a module or DocType if exists"""
- if name=="[Select]": return ""
-
- if "." in name:
- obj = frappe.get_attr(name)
- else:
- obj = get_controller(name)
-
- if hasattr(obj, "__doclink__"):
- return obj.__doclink__
- else:
- return ""
diff --git a/frappe/utils/jinja.py b/frappe/utils/jinja.py
index 0d5ed56d9a..25532b5774 100644
--- a/frappe/utils/jinja.py
+++ b/frappe/utils/jinja.py
@@ -32,9 +32,10 @@ def get_allowed_functions_for_jenv():
import frappe
import frappe.utils
import frappe.utils.data
- from frappe.utils.autodoc import automodule, get_doclink, get_version
+ from frappe.utils.autodoc import automodule, get_version
from frappe.model.document import get_controller
from frappe.website.utils import get_shade
+ from frappe.modules import scrub
datautils = {}
for key, obj in frappe.utils.data.__dict__.items():
@@ -76,14 +77,14 @@ def get_allowed_functions_for_jenv():
},
"autodoc": {
"get_version": get_version,
- "get_doclink": get_doclink,
"automodule": automodule,
"get_controller": get_controller
},
"get_visible_columns": \
frappe.get_attr("frappe.templates.pages.print.get_visible_columns"),
"_": frappe._,
- "get_shade": get_shade
+ "get_shade": get_shade,
+ "scrub": scrub
}
def get_jloader():
diff --git a/frappe/utils/setup_docs.py b/frappe/utils/setup_docs.py
index c47e6c389e..a9e0f61b28 100644
--- a/frappe/utils/setup_docs.py
+++ b/frappe/utils/setup_docs.py
@@ -6,20 +6,50 @@ Call from command line:
"""
-import os, json, frappe
+import os, json, frappe, markdown2, shutil
class setup_docs(object):
- def __init__(self, app, docs_app, path):
- """Generate source templates for models reference and module API.
-
- Must set globals `self.models_base_path`, `self.api_base_path` and `self.app_path`.
+ def __init__(self):
+ """Generate source templates for models reference and module API
+ and templates at `templates/autodoc`
"""
- self.app = app
- self.app_path = frappe.get_app_path(app)
- if path[0]=="/": path = path[1:]
- path = frappe.get_app_path(docs_app, path)
+ self.app = frappe.get_hooks("autodoc").get("for_app")[0]
+ docs_app = frappe.get_hooks("autodoc").get("docs_app")[0]
+
+ hooks = frappe.get_hooks(app_name = self.app)
+ self.app_title = hooks.get("app_title")[0]
+
+ self.app_path = frappe.get_app_path(self.app)
+ path = frappe.get_app_path(docs_app, "www", "current")
+
+ print "Deleting current..."
+ shutil.rmtree(path, ignore_errors = True)
+ os.makedirs(path)
+
+ self.app_context = {
+ "app": {
+ "name": self.app,
+ "title": self.app_title,
+ "description": markdown2.markdown(hooks.get("app_description")[0]),
+ "version": hooks.get("app_version")[0],
+ "publisher": hooks.get("app_publisher")[0],
+ "github_link": hooks.get("github_link")[0],
+ }
+ }
+
+ # make home page
+ with open(os.path.join(path, "index.html"), "w") as home:
+ home.write(frappe.render_template("templates/autodoc/docs_home.html",
+ self.app_context))
+
+ # make folders
self.models_base_path = os.path.join(path, "models")
+ self.make_folder(self.models_base_path,
+ template = "templates/autodoc/models_home.html")
+
self.api_base_path = os.path.join(path, "api")
+ self.make_folder(self.api_base_path,
+ template = "templates/autodoc/api_home.html")
for basepath, folders, files in os.walk(self.app_path):
if "doctype" not in basepath:
@@ -28,7 +58,9 @@ class setup_docs(object):
module_folder = os.path.join(self.models_base_path, module)
- self.make_folder(module_folder)
+ self.make_folder(module_folder,
+ template = "templates/autodoc/module_home.html",
+ context = {"name": module})
self.update_index_txt(module_folder)
if "doctype" in basepath:
@@ -70,35 +102,37 @@ class setup_docs(object):
if not os.path.exists(module_doc_path):
print "Writing " + module_doc_path
with open(module_doc_path, "w") as f:
- f.write("""
%(name)s
-
-
- {%%- from "templates/autodoc/macros.html" import automodule -%%}
-
- {{ automodule("%(name)s") }}""" % {"name": self.app + "." + module_name})
+ context = {"name": self.app + "." + module_name}
+ context.update(self.app_context)
+ f.write(frappe.render_template("templates/autodoc/pymodule.html",
+ context))
self.update_index_txt(module_folder)
- def make_folder(self, path):
+ def make_folder(self, path, template=None, context=None):
+ if not template:
+ template = "templates/autodoc/package_index.html"
+
if not os.path.exists(path):
os.makedirs(path)
- index_txt_path = os.path.join(path, "index.txt")
- if not os.path.exists(index_txt_path):
+ index_txt_path = os.path.join(path, "index.txt")
print "Writing " + index_txt_path
with open(index_txt_path, "w") as f:
f.write("")
- index_md_path = os.path.join(path, "index.html")
- if not os.path.exists(index_md_path):
- name = os.path.basename(path)
- if name==".":
- name = self.app
- print "Writing " + index_md_path
- with open(index_md_path, "w") as f:
- f.write("""
{0}
-
-{{index}}""".format(name))
+ index_html_path = os.path.join(path, "index.html")
+ if not context:
+ name = os.path.basename(path)
+ if name==".":
+ name = self.app
+ context = {
+ "title": name
+ }
+ context.update(self.app_context)
+ print "Writing " + index_html_path
+ with open(index_html_path, "w") as f:
+ f.write(frappe.render_template(template, context))
def update_index_txt(self, path):
index_txt_path = os.path.join(path, "index.txt")
@@ -126,12 +160,7 @@ class setup_docs(object):
print "Writing " + model_path
with open(model_path, "w") as f:
- f.write("""
%(doctype)s
-
-
- {%% from "templates/autodoc/doctype.html" import render_doctype %%}
-
- {{ render_doctype("%(doctype)s") }}
-
-
- """ % {"doctype": doctype_real_name})
+ context = {"doctype": doctype_real_name}
+ context.update(self.app_context)
+ f.write(frappe.render_template("templates/autodoc/doctype.html",
+ context).encode("utf-8"))
diff --git a/frappe/website/doctype/blog_post/test_blog_post.py b/frappe/website/doctype/blog_post/test_blog_post.py
index fd7647834a..0ff58aa563 100644
--- a/frappe/website/doctype/blog_post/test_blog_post.py
+++ b/frappe/website/doctype/blog_post/test_blog_post.py
@@ -1,177 +1,9 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# MIT License. See license.txt
from __future__ import unicode_literals
-
-"""Use blog post test to test user permissions logic"""
-
import frappe
-import frappe.defaults
import unittest
-import json
-import frappe.model.meta
-from frappe.core.page.user_permissions.user_permissions import add, remove, get_permissions
-from frappe.permissions import clear_user_permissions_for_doctype, get_doc_permissions
-test_records = frappe.get_test_records('Blog Post')
-
-test_dependencies = ["User"]
class TestBlogPost(unittest.TestCase):
- def setUp(self):
- frappe.clear_cache(doctype="Blog Post")
+ pass
- user = frappe.get_doc("User", "test1@example.com")
- user.add_roles("Website Manager")
-
- user = frappe.get_doc("User", "test2@example.com")
- user.add_roles("Blogger")
-
- frappe.set_user("test1@example.com")
-
- def tearDown(self):
- frappe.set_user("Administrator")
- frappe.db.set_value("Blogger", "_Test Blogger 1", "user", None)
-
- clear_user_permissions_for_doctype("Blog Category")
- clear_user_permissions_for_doctype("Blog Post")
- clear_user_permissions_for_doctype("Blogger")
-
- frappe.db.sql("""update `tabDocPerm` set user_permission_doctypes=null
- where parent='Blog Post' and permlevel=0 and apply_user_permissions=1
- and `read`=1""")
-
- def test_basic_permission(self):
- post = frappe.get_doc("Blog Post", "_test-blog-post")
- self.assertTrue(post.has_permission("read"))
-
- def test_user_permissions_in_doc(self):
- frappe.permissions.add_user_permission("Blog Category", "_Test Blog Category 1",
- "test2@example.com")
-
- frappe.set_user("test2@example.com")
-
- post = frappe.get_doc("Blog Post", "_test-blog-post")
- self.assertFalse(post.has_permission("read"))
- self.assertFalse(get_doc_permissions(post).get("read"))
-
- post1 = frappe.get_doc("Blog Post", "_test-blog-post-1")
- self.assertTrue(post1.has_permission("read"))
- self.assertTrue(get_doc_permissions(post1).get("read"))
-
- def test_user_permissions_in_report(self):
- frappe.permissions.add_user_permission("Blog Category", "_Test Blog Category 1", "test2@example.com")
-
- frappe.set_user("test2@example.com")
- names = [d.name for d in frappe.get_list("Blog Post", fields=["name", "blog_category"])]
-
- self.assertTrue("_test-blog-post-1" in names)
- self.assertFalse("_test-blog-post" in names)
-
- def test_default_values(self):
- frappe.permissions.add_user_permission("Blog Category", "_Test Blog Category 1", "test2@example.com")
-
- frappe.set_user("test2@example.com")
- doc = frappe.new_doc("Blog Post")
- self.assertEquals(doc.get("blog_category"), "_Test Blog Category 1")
-
- def test_user_link_match_doc(self):
- blogger = frappe.get_doc("Blogger", "_Test Blogger 1")
- blogger.user = "test2@example.com"
- blogger.save()
-
- frappe.set_user("test2@example.com")
-
- post = frappe.get_doc("Blog Post", "_test-blog-post-2")
- self.assertTrue(post.has_permission("read"))
-
- post1 = frappe.get_doc("Blog Post", "_test-blog-post-1")
- self.assertFalse(post1.has_permission("read"))
-
- def test_user_link_match_report(self):
- blogger = frappe.get_doc("Blogger", "_Test Blogger 1")
- blogger.user = "test2@example.com"
- blogger.save()
-
- frappe.set_user("test2@example.com")
-
- names = [d.name for d in frappe.get_list("Blog Post", fields=["name", "owner"])]
- self.assertTrue("_test-blog-post-2" in names)
- self.assertFalse("_test-blog-post-1" in names)
-
- def test_set_user_permissions(self):
- frappe.set_user("test1@example.com")
- add("test2@example.com", "Blog Post", "_test-blog-post")
-
- def test_not_allowed_to_set_user_permissions(self):
- frappe.set_user("test2@example.com")
-
- # this user can't add user permissions
- self.assertRaises(frappe.PermissionError, add,
- "test2@example.com", "Blog Post", "_test-blog-post")
-
- def test_read_if_explicit_user_permissions_are_set(self):
- self.test_set_user_permissions()
-
- frappe.set_user("test2@example.com")
-
- # user can only access permitted blog post
- doc = frappe.get_doc("Blog Post", "_test-blog-post")
- self.assertTrue(doc.has_permission("read"))
-
- # and not this one
- doc = frappe.get_doc("Blog Post", "_test-blog-post-1")
- self.assertFalse(doc.has_permission("read"))
-
- def test_not_allowed_to_remove_user_permissions(self):
- self.test_set_user_permissions()
- defname = get_permissions("test2@example.com", "Blog Post", "_test-blog-post")[0].name
-
- frappe.set_user("test2@example.com")
-
- # user cannot remove their own user permissions
- self.assertRaises(frappe.PermissionError, remove,
- "test2@example.com", defname, "Blog Post", "_test-blog-post")
-
- def test_user_permissions_based_on_blogger(self):
- frappe.set_user("test2@example.com")
- doc = frappe.get_doc("Blog Post", "_test-blog-post-1")
- self.assertTrue(doc.has_permission("read"))
-
- frappe.set_user("test1@example.com")
- add("test2@example.com", "Blog Post", "_test-blog-post")
-
- frappe.set_user("test2@example.com")
- doc = frappe.get_doc("Blog Post", "_test-blog-post-1")
- self.assertFalse(doc.has_permission("read"))
-
- doc = frappe.get_doc("Blog Post", "_test-blog-post")
- self.assertTrue(doc.has_permission("read"))
-
- def test_set_only_once(self):
- blog_post = frappe.get_meta("Blog Post")
- blog_post.get_field("title").set_only_once = 1
- doc = frappe.get_doc("Blog Post", "_test-blog-post-1")
- doc.title = "New"
- self.assertRaises(frappe.CannotChangeConstantError, doc.save)
- blog_post.get_field("title").set_only_once = 0
-
- def test_user_permission_doctypes(self):
- frappe.permissions.add_user_permission("Blog Category", "_Test Blog Category 1",
- "test2@example.com")
- frappe.permissions.add_user_permission("Blogger", "_Test Blogger 1",
- "test2@example.com")
-
- frappe.set_user("test2@example.com")
-
- frappe.db.sql("""update `tabDocPerm` set user_permission_doctypes=%s
- where parent='Blog Post' and permlevel=0 and apply_user_permissions=1
- and `read`=1""", json.dumps(["Blogger"]))
-
- frappe.model.meta.clear_cache("Blog Post")
-
- doc = frappe.get_doc("Blog Post", "_test-blog-post")
- self.assertFalse(doc.has_permission("read"))
-
- doc = frappe.get_doc("Blog Post", "_test-blog-post-2")
- self.assertTrue(doc.has_permission("read"))
-
- frappe.model.meta.clear_cache("Blog Post")
diff --git a/frappe/website/doctype/web_form/web_form.json b/frappe/website/doctype/web_form/web_form.json
index 54b3a42ba7..af2998fbfb 100644
--- a/frappe/website/doctype/web_form/web_form.json
+++ b/frappe/website/doctype/web_form/web_form.json
@@ -214,7 +214,7 @@
"precision": ""
},
{
- "description": "In JSON as
[{\"title\":\"Jobs\", \"name\":\"jobs\"}]",
+ "description": "In JSON as [{\"title\":\"Jobs\", \"name\":\"jobs\"}]",
"fieldname": "breadcrumbs",
"fieldtype": "Small Text",
"label": "Breadcrumbs",
@@ -262,4 +262,4 @@
"sort_field": "modified",
"sort_order": "DESC",
"title_field": "title"
-}
\ No newline at end of file
+}
diff --git a/frappe/website/doctype/web_page/web_page.json b/frappe/website/doctype/web_page/web_page.json
index f671e49593..e9fa1bc3ea 100644
--- a/frappe/website/doctype/web_page/web_page.json
+++ b/frappe/website/doctype/web_page/web_page.json
@@ -200,22 +200,41 @@
"icon": "icon-file-alt",
"idx": 1,
"max_attachments": 20,
- "modified": "2015-07-13 04:46:59.435179",
+ "modified": "2015-07-22 12:38:08.696692",
"modified_by": "Administrator",
"module": "Website",
"name": "Web Page",
"owner": "Administrator",
"permissions": [
{
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Website Manager",
+ "share": 1,
+ "submit": 0,
+ "write": 0
+ },
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
"cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
+ "export": 1,
+ "import": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
- "role": "Website Manager",
+ "role": "Guest",
+ "set_user_permissions": 0,
"share": 1,
"submit": 0,
"write": 1
diff --git a/frappe/website/doctype/website_settings/website_settings.json b/frappe/website/doctype/website_settings/website_settings.json
index 9df4654b72..ecb6f234bc 100644
--- a/frappe/website/doctype/website_settings/website_settings.json
+++ b/frappe/website/doctype/website_settings/website_settings.json
@@ -231,7 +231,7 @@
"permlevel": 0
},
{
- "description": "An icon file with .ico extension. Should be 16 x 16 px. Generated using a favicon generator. [
favicon-generator.org]",
+ "description": "An icon file with .ico extension. Should be 16 x 16 px. Generated using a favicon generator. [favicon-generator.org]",
"fieldname": "favicon",
"fieldtype": "Attach",
"label": "FavIcon",
@@ -296,4 +296,4 @@
"submit": 0
}
]
-}
\ No newline at end of file
+}
diff --git a/frappe/website/doctype/website_settings/website_settings.py b/frappe/website/doctype/website_settings/website_settings.py
index fb5b34a83f..3f168edc35 100644
--- a/frappe/website/doctype/website_settings/website_settings.py
+++ b/frappe/website/doctype/website_settings/website_settings.py
@@ -118,8 +118,6 @@ def get_website_settings():
context.web_include_css = hooks.web_include_css or []
- add_website_theme(context)
-
via_hooks = frappe.get_hooks("website_context")
for key in via_hooks:
context[key] = via_hooks[key]
@@ -127,10 +125,12 @@ def get_website_settings():
and isinstance(context[key], (list, tuple)):
context[key] = context[key][0]
+ add_website_theme(context)
+
if not context.get("favicon"):
context["favicon"] = "/assets/frappe/images/favicon.png"
- if settings.favicon:
+ if settings.favicon and settings.favicon != "attach_files:":
context["favicon"] = settings.favicon
return context
diff --git a/frappe/website/doctype/website_theme/website_theme.json b/frappe/website/doctype/website_theme/website_theme.json
index 5b8293ebce..b01c2576ab 100644
--- a/frappe/website/doctype/website_theme/website_theme.json
+++ b/frappe/website/doctype/website_theme/website_theme.json
@@ -1,304 +1,304 @@
{
- "allow_copy": 0,
- "allow_import": 1,
- "allow_rename": 0,
- "autoname": "field:theme",
- "creation": "2015-02-18 12:46:38.168929",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Master",
+ "allow_copy": 0,
+ "allow_import": 1,
+ "allow_rename": 0,
+ "autoname": "field:theme",
+ "creation": "2015-02-18 12:46:38.168929",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Master",
"fields": [
{
- "allow_on_submit": 0,
- "fieldname": "theme",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Theme",
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 1,
+ "allow_on_submit": 0,
+ "fieldname": "theme",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Theme",
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 1,
"set_only_once": 0
- },
+ },
{
- "allow_on_submit": 0,
- "default": "Website",
- "fieldname": "module",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Module",
- "no_copy": 0,
- "options": "Module Def",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
+ "allow_on_submit": 0,
+ "default": "Website",
+ "fieldname": "module",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Module",
+ "no_copy": 0,
+ "options": "Module Def",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
"set_only_once": 0
- },
+ },
{
- "default": "1",
- "description": "This must be checked if the below style settings are applicable",
- "fieldname": "apply_style",
- "fieldtype": "Check",
- "hidden": 0,
- "label": "Apply Style",
- "permlevel": 0,
+ "default": "1",
+ "description": "This must be checked if the below style settings are applicable",
+ "fieldname": "apply_style",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "label": "Apply Style",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "default": "1",
- "fieldname": "custom",
- "fieldtype": "Check",
- "label": "Custom?",
- "permlevel": 0,
+ "default": "1",
+ "fieldname": "custom",
+ "fieldtype": "Check",
+ "label": "Custom?",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "allow_on_submit": 0,
- "fieldname": "column_break_2",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
+ "allow_on_submit": 0,
+ "fieldname": "column_break_2",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
"set_only_once": 0
- },
+ },
{
- "description": "Link to your Bootstrap theme",
- "fieldname": "bootstrap",
- "fieldtype": "Small Text",
- "label": "Link to Bootstrap CSS",
- "permlevel": 0,
+ "description": "Link to your Bootstrap theme",
+ "fieldname": "bootstrap",
+ "fieldtype": "Small Text",
+ "label": "Link to Bootstrap CSS",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "depends_on": "apply_style",
- "fieldname": "section_break_14",
- "fieldtype": "Section Break",
- "permlevel": 0,
+ "depends_on": "apply_style",
+ "fieldname": "section_break_14",
+ "fieldtype": "Section Break",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "default": "",
- "fieldname": "font_size",
- "fieldtype": "Select",
- "label": "Font Size",
- "options": "\n12px\n13px\n14px\n15px\n16px\n17px\n18px",
- "permlevel": 0,
+ "default": "",
+ "fieldname": "font_size",
+ "fieldtype": "Select",
+ "label": "Font Size",
+ "options": "\n12px\n13px\n14px\n15px\n16px\n17px\n18px",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "description": "Add the name of a
Google Web Font e.g. \"Open Sans\"",
- "fieldname": "text_webfont",
- "fieldtype": "Data",
- "label": "Google Font (Text)",
- "permlevel": 0,
+ "description": "Add the name of a \"Google Web Font\" e.g. \"Open Sans\"",
+ "fieldname": "text_webfont",
+ "fieldtype": "Data",
+ "label": "Google Font (Text)",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "description": "Add the name of a
Google Web Font e.g. \"Open Sans\"",
- "fieldname": "heading_webfont",
- "fieldtype": "Data",
- "label": "Google Font (Heading)",
- "permlevel": 0,
+ "description": "Add the name of a \"Google Web Font\" e.g. \"Open Sans\"",
+ "fieldname": "heading_webfont",
+ "fieldtype": "Data",
+ "label": "Google Font (Heading)",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "fieldname": "column_break_18",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break_18",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "fieldname": "text_color",
- "fieldtype": "Data",
- "label": "Text Color",
- "permlevel": 0,
+ "fieldname": "text_color",
+ "fieldtype": "Data",
+ "label": "Text Color",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "fieldname": "link_color",
- "fieldtype": "Data",
- "label": "Link Color",
- "permlevel": 0,
+ "fieldname": "link_color",
+ "fieldtype": "Data",
+ "label": "Link Color",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "fieldname": "heading_style",
- "fieldtype": "Select",
- "label": "Heading Style",
- "options": "\nUPPERCASE\nTitle Case\nlowercase",
- "permlevel": 0,
+ "fieldname": "heading_style",
+ "fieldtype": "Select",
+ "label": "Heading Style",
+ "options": "\nUPPERCASE\nTitle Case\nlowercase",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "depends_on": "apply_style",
- "fieldname": "section_break_8",
- "fieldtype": "Section Break",
- "permlevel": 0,
+ "depends_on": "apply_style",
+ "fieldname": "section_break_8",
+ "fieldtype": "Section Break",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "fieldname": "top_bar_color",
- "fieldtype": "Data",
- "label": "Top Bar Color",
- "permlevel": 0,
+ "fieldname": "top_bar_color",
+ "fieldtype": "Data",
+ "label": "Top Bar Color",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "fieldname": "top_bar_text_color",
- "fieldtype": "Data",
- "label": "Top Bar Text Color",
- "permlevel": 0,
+ "fieldname": "top_bar_text_color",
+ "fieldtype": "Data",
+ "label": "Top Bar Text Color",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "fieldname": "no_sidebar",
- "fieldtype": "Check",
- "label": "Hide Sidebar",
- "permlevel": 0,
+ "fieldname": "no_sidebar",
+ "fieldtype": "Check",
+ "label": "Hide Sidebar",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "fieldname": "column_break_11",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break_11",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "fieldname": "footer_color",
- "fieldtype": "Data",
- "label": "Footer Color",
- "permlevel": 0,
+ "fieldname": "footer_color",
+ "fieldtype": "Data",
+ "label": "Footer Color",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "fieldname": "footer_text_color",
- "fieldtype": "Data",
- "label": "Footer Text Color",
- "permlevel": 0,
+ "fieldname": "footer_text_color",
+ "fieldtype": "Data",
+ "label": "Footer Text Color",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "depends_on": "apply_style",
- "fieldname": "section_break_4",
- "fieldtype": "Section Break",
- "permlevel": 0,
+ "depends_on": "apply_style",
+ "fieldname": "section_break_4",
+ "fieldtype": "Section Break",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "fieldname": "background_color",
- "fieldtype": "Data",
- "label": "Background Color",
- "permlevel": 0,
+ "fieldname": "background_color",
+ "fieldtype": "Data",
+ "label": "Background Color",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "fieldname": "column_break_6",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break_6",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "description": "If image is selected, color will be ignored.",
- "fieldname": "background_image",
- "fieldtype": "Attach Image",
- "label": "Background Image",
- "permlevel": 0,
+ "description": "If image is selected, color will be ignored.",
+ "fieldname": "background_image",
+ "fieldtype": "Attach Image",
+ "label": "Background Image",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "depends_on": "",
- "fieldname": "section_break_21",
- "fieldtype": "Section Break",
- "permlevel": 0,
+ "depends_on": "",
+ "fieldname": "section_break_21",
+ "fieldtype": "Section Break",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "depends_on": "apply_style",
- "description": "",
- "fieldname": "css",
- "fieldtype": "Code",
- "label": "Style using CSS",
- "permlevel": 0,
+ "depends_on": "apply_style",
+ "description": "",
+ "fieldname": "css",
+ "fieldtype": "Code",
+ "label": "Style using CSS",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "fieldname": "js",
- "fieldtype": "Code",
- "label": "JavaScript",
- "permlevel": 0,
+ "fieldname": "js",
+ "fieldtype": "Code",
+ "label": "JavaScript",
+ "permlevel": 0,
"precision": ""
}
- ],
- "hide_heading": 0,
- "hide_toolbar": 0,
- "in_create": 0,
- "in_dialog": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "modified": "2015-07-13 04:45:02.429785",
- "modified_by": "Administrator",
- "module": "Website",
- "name": "Website Theme",
- "name_case": "",
- "owner": "Administrator",
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "in_create": 0,
+ "in_dialog": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "modified": "2015-07-27 01:00:32.901851",
+ "modified_by": "Administrator",
+ "module": "Website",
+ "name": "Website Theme",
+ "name_case": "",
+ "owner": "Administrator",
"permissions": [
{
- "create": 1,
- "delete": 1,
- "permlevel": 0,
- "read": 1,
- "role": "Website Manager",
+ "create": 1,
+ "delete": 1,
+ "permlevel": 0,
+ "read": 1,
+ "role": "Website Manager",
"write": 1
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 1,
- "delete": 1,
- "email": 0,
- "export": 1,
- "import": 1,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Administrator",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 0,
+ "export": 1,
+ "import": 1,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Administrator",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 1
}
- ],
- "read_only": 0,
- "read_only_onload": 0,
- "search_fields": "",
- "sort_field": "modified",
- "sort_order": "DESC",
+ ],
+ "read_only": 0,
+ "read_only_onload": 0,
+ "search_fields": "",
+ "sort_field": "modified",
+ "sort_order": "DESC",
"title_field": ""
-}
\ No newline at end of file
+}
diff --git a/frappe/website/doctype/website_theme/website_theme.py b/frappe/website/doctype/website_theme/website_theme.py
index 33601b0935..2cea0329f4 100644
--- a/frappe/website/doctype/website_theme/website_theme.py
+++ b/frappe/website/doctype/website_theme/website_theme.py
@@ -63,13 +63,20 @@ def use_theme(theme):
def add_website_theme(context):
bootstrap = frappe.get_hooks("bootstrap")[0]
- website_theme = get_active_theme()
- context.theme = website_theme and website_theme.as_dict() or frappe._dict()
- if website_theme:
- if website_theme.bootstrap:
- bootstrap = website_theme.bootstrap
+ web_include_css = context.web_include_css
+ context.theme = frappe._dict()
- context.no_sidebar = website_theme.no_sidebar
+ if not context.disable_website_theme:
+ website_theme = get_active_theme()
+ context.theme = website_theme and website_theme.as_dict() or frappe._dict()
+
+ if website_theme:
+ if website_theme.bootstrap:
+ bootstrap = website_theme.bootstrap
+
+ context.no_sidebar = website_theme.no_sidebar
+
+ context.web_include_css = ["website_theme.css"] + context.web_include_css
context.web_include_css = [bootstrap] + context.web_include_css
diff --git a/frappe/website/js/website.js b/frappe/website/js/website.js
index 4e4eb1d054..5adf938279 100644
--- a/frappe/website/js/website.js
+++ b/frappe/website/js/website.js
@@ -340,6 +340,9 @@ $.extend(frappe, {
// change id of current page
$(".page-container").attr("id", "page-" + data.path);
+ // set data-path value in body
+ $("body").attr("data-path", data.path);
+
// clear page-header-right
$(".page-header-right").html("");
diff --git a/frappe/workflow/doctype/workflow/workflow.json b/frappe/workflow/doctype/workflow/workflow.json
index 00244cdd2e..1d5b2232a8 100644
--- a/frappe/workflow/doctype/workflow/workflow.json
+++ b/frappe/workflow/doctype/workflow/workflow.json
@@ -1,100 +1,100 @@
{
- "allow_rename": 1,
- "autoname": "field:workflow_name",
- "creation": "2012-12-28 10:49:55",
- "description": "Defines workflow states and rules for a document.",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Transaction",
+ "allow_rename": 1,
+ "autoname": "field:workflow_name",
+ "creation": "2012-12-28 10:49:55",
+ "description": "Defines workflow states and rules for a document.",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Transaction",
"fields": [
{
- "fieldname": "workflow_name",
- "fieldtype": "Data",
- "in_list_view": 0,
- "label": "Workflow Name",
- "permlevel": 0,
- "read_only": 0,
+ "fieldname": "workflow_name",
+ "fieldtype": "Data",
+ "in_list_view": 0,
+ "label": "Workflow Name",
+ "permlevel": 0,
+ "read_only": 0,
"reqd": 1
- },
+ },
{
- "description": "DocType on which this Workflow is applicable.",
- "fieldname": "document_type",
- "fieldtype": "Link",
- "in_list_view": 0,
- "label": "Document Type",
- "options": "DocType",
- "permlevel": 0,
+ "description": "DocType on which this Workflow is applicable.",
+ "fieldname": "document_type",
+ "fieldtype": "Link",
+ "in_list_view": 0,
+ "label": "Document Type",
+ "options": "DocType",
+ "permlevel": 0,
"reqd": 1
- },
+ },
{
- "description": "If checked, all other workflows become inactive.",
- "fieldname": "is_active",
- "fieldtype": "Check",
- "in_list_view": 0,
- "label": "Is Active",
+ "description": "If checked, all other workflows become inactive.",
+ "fieldname": "is_active",
+ "fieldtype": "Check",
+ "in_list_view": 0,
+ "label": "Is Active",
"permlevel": 0
- },
+ },
{
- "description": "Different \"States\" this document can exist in. Like \"Open\", \"Pending Approval\" etc.",
- "fieldname": "states_head",
- "fieldtype": "Section Break",
- "label": "States",
+ "description": "Different \"States\" this document can exist in. Like \"Open\", \"Pending Approval\" etc.",
+ "fieldname": "states_head",
+ "fieldtype": "Section Break",
+ "label": "States",
"permlevel": 0
- },
+ },
{
- "description": "All possible Workflow States and roles of the workflow.
Docstatus Options: 0 is\"Saved\", 1 is \"Submitted\" and 2 is \"Cancelled\"",
- "fieldname": "states",
- "fieldtype": "Table",
- "label": "Document States",
- "options": "Workflow Document State",
- "permlevel": 0,
+ "description": "All possible Workflow States and roles of the workflow. \nDocstatus Options: 0 is\"Saved\", 1 is \"Submitted\" and 2 is \"Cancelled\"",
+ "fieldname": "states",
+ "fieldtype": "Table",
+ "label": "Document States",
+ "options": "Workflow Document State",
+ "permlevel": 0,
"reqd": 1
- },
+ },
{
- "description": "Rules for how states are transitions, like next state and which role is allowed to change state etc.",
- "fieldname": "transition_rules",
- "fieldtype": "Section Break",
- "label": "Transition Rules",
+ "description": "Rules for how states are transitions, like next state and which role is allowed to change state etc.",
+ "fieldname": "transition_rules",
+ "fieldtype": "Section Break",
+ "label": "Transition Rules",
"permlevel": 0
- },
+ },
{
- "description": "Rules defining transition of state in the workflow.",
- "fieldname": "transitions",
- "fieldtype": "Table",
- "label": "Transitions",
- "options": "Workflow Transition",
- "permlevel": 0,
+ "description": "Rules defining transition of state in the workflow.",
+ "fieldname": "transitions",
+ "fieldtype": "Table",
+ "label": "Transitions",
+ "options": "Workflow Transition",
+ "permlevel": 0,
"reqd": 1
- },
+ },
{
- "default": "workflow_state",
- "description": "Field that represents the Workflow State of the transaction (if field is not present, a new hidden Custom Field will be created)",
- "fieldname": "workflow_state_field",
- "fieldtype": "Data",
- "label": "Workflow State Field",
+ "default": "workflow_state",
+ "description": "Field that represents the Workflow State of the transaction (if field is not present, a new hidden Custom Field will be created)",
+ "fieldname": "workflow_state_field",
+ "fieldtype": "Data",
+ "label": "Workflow State Field",
"permlevel": 0
}
- ],
- "icon": "icon-random",
- "idx": 1,
- "modified": "2015-02-05 05:11:49.280959",
- "modified_by": "Administrator",
- "module": "Workflow",
- "name": "Workflow",
- "owner": "Administrator",
+ ],
+ "icon": "icon-random",
+ "idx": 1,
+ "modified": "2015-07-27 01:00:32.901851",
+ "modified_by": "Administrator",
+ "module": "Workflow",
+ "name": "Workflow",
+ "owner": "Administrator",
"permissions": [
{
- "cancel": 0,
- "create": 1,
- "delete": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "role": "System Manager",
- "share": 1,
- "submit": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "role": "System Manager",
+ "share": 1,
+ "submit": 0,
"write": 1
}
]
-}
\ No newline at end of file
+}
diff --git a/setup.py b/setup.py
index cd68a5b602..e3e366f215 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
from setuptools import setup, find_packages
-version = "5.1.3"
+version = "5.1.4"
with open("requirements.txt", "r") as f:
install_requires = f.readlines()