diff --git a/webnotes/core/doctype/doctype/doctype.txt b/webnotes/core/doctype/doctype/doctype.txt index 1abc5fc7c2..a155cf9ace 100644 --- a/webnotes/core/doctype/doctype/doctype.txt +++ b/webnotes/core/doctype/doctype/doctype.txt @@ -2,7 +2,7 @@ { "creation": "2013-02-18 13:36:19", "docstatus": 0, - "modified": "2014-01-24 11:25:15", + "modified": "2014-01-27 11:57:14", "modified_by": "Administrator", "owner": "Administrator" }, @@ -33,7 +33,6 @@ }, { "cancel": 0, - "delete": 0, "doctype": "DocPerm", "email": 1, "name": "__common__", @@ -64,11 +63,13 @@ "doctype": "DocField", "fieldname": "module", "fieldtype": "Link", + "in_list_view": 1, "label": "Module", "oldfieldname": "module", "oldfieldtype": "Link", "options": "Module Def", - "reqd": 1 + "reqd": 1, + "search_index": 1 }, { "description": "Child Tables are shown as a Grid in other DocTypes.", @@ -360,11 +361,13 @@ "search_index": 0 }, { + "delete": 0, "doctype": "DocPerm", "role": "System Manager" }, { "create": 1, + "delete": 1, "doctype": "DocPerm", "role": "Administrator", "write": 1 diff --git a/webnotes/profile.py b/webnotes/profile.py index 6a49367144..642eb7df5e 100644 --- a/webnotes/profile.py +++ b/webnotes/profile.py @@ -48,8 +48,8 @@ class Profile: def build_perm_map(self): """build map of permissions at level 0""" self.perm_map = {} - for r in webnotes.conn.sql("""select parent, `read`, `write`, `create`, `submit`, `cancel`, - `report`, `import`, `export`, `print`, `email`, `restrict` + for r in webnotes.conn.sql("""select parent, `read`, `write`, `create`, `delete`, `submit`, + `cancel`,`report`, `import`, `export`, `print`, `email`, `restrict` from tabDocPerm where docstatus=0 and ifnull(permlevel,0)=0 and parent not like "old_parent:%%" @@ -59,11 +59,11 @@ class Profile: if not dt in self.perm_map: self.perm_map[dt] = {} - for k in ('read', 'write', 'create', 'submit', 'cancel', 'amend', + for k in ('read', 'write', 'create', 'submit', 'cancel', 'amend', 'delete', 'report', 'import', 'export', 'print', 'email', 'restrict'): if not self.perm_map[dt].get(k): self.perm_map[dt][k] = r.get(k) - + def build_permissions(self): """build lists of what the user can read / write / create quirks: diff --git a/webnotes/public/js/lib/slickgrid/slick-default-theme.css b/webnotes/public/js/lib/slickgrid/slick-default-theme.css index feba1ff0bd..741b8043db 100644 --- a/webnotes/public/js/lib/slickgrid/slick-default-theme.css +++ b/webnotes/public/js/lib/slickgrid/slick-default-theme.css @@ -45,7 +45,10 @@ classes should alter those! } .slick-cell { - padding: 0px 4px; + padding: 1px 4px 0px 5px; + border-top: 0px; + border-left: 0px; + border-right: 1px solid silver; } .slick-group { diff --git a/webnotes/public/js/wn/form/control.js b/webnotes/public/js/wn/form/control.js index 1ca9519f27..bacd0359a1 100644 --- a/webnotes/public/js/wn/form/control.js +++ b/webnotes/public/js/wn/form/control.js @@ -462,7 +462,7 @@ wn.ui.form.ControlCheck = wn.ui.form.ControlData.extend({ input_type: "checkbox", make_wrapper: function() { this.$wrapper = $('