Commit graph

74 commits

Author SHA1 Message Date
Aditya Hase
f78df81990 Convert dict.items() to list for modifying dict while looping 2017-09-04 16:05:57 +05:30
Aditya Hase
769338f136 Replaced all instances of basestring with six.string_types 2017-08-11 00:10:11 +05:30
Rushabh Mehta
f609a478ae [refactor] user permissions (#3713)
* [refactor] user permissions

* [fix] tests

* [ux] user-permissions

* [minor] cleanup system settings

* [minor] end progress
2017-07-28 14:33:31 +05:30
Rushabh Mehta
e2d51c8589 [multiple] frappe.permissions.add_permission, cleanup address and contact html 2017-06-22 18:21:48 +05:30
Saurabh
eb9551fca7 [fix] check all custom perms before adding permissions from standard docperm (#3280) 2017-05-12 15:41:26 +05:30
tundebabzy
6e29d9e925 xrange to range (#3237)
* introduces build status for local fork

* converts xrange to range using six.moves.range7

* converts xrange to range using six.moves.range7

* converts xrange to range using six.moves.range7

* converts xrange to range using six.moves.range

* converts xrange to range using six.moves.range

* converts xrange to range using six.moves.range7

* converts xrange to range using six.moves.range7

* converts xrange to range using six.moves.range7

* converts xrange to range using six.moves.range7

* converts xrange to range using six.moves.range7

* converts xrange to range using six.moves.range7

* converts xrange to range using six.moves.range7

* converts xrange to range using six.moves.range7

* Revert "introduces build status for local fork"

This reverts commit 61f40983d0b3c6725369171ab850a18e5c029cc4.
2017-05-11 10:55:34 +05:30
tundebabzy
7b41d7e5eb Python 3 compatible print statements (#3199)
* changes print statements in file to python 3 compatible style using `__future__`

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* changes deprecated md5 module to hashlib

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements

* adds python 3 style for print statements
2017-05-01 12:34:29 +05:30
Rohit Waghchaure
e996fd0c55 Changed tabUserRoel to tabHas Role 2017-03-06 14:42:14 +05:30
Rohit Waghchaure
8a2c83918b changed user_roles to roles 2017-03-06 14:42:13 +05:30
Makarand Bauskar
6dabc55096 [minor] listview & permissions minor fixes (#2647) 2017-01-30 10:45:35 +05:30
Rushabh Mehta
636c662048 [patch] added patch for migration 2017-01-12 15:48:49 +05:30
Rushabh Mehta
3f91c9455f [enhance] custom perms 2017-01-11 17:34:55 +05:30
RobertSchouten
02a7c0dc73 allow creation of user permissions on site creation (#2006) 2016-09-12 15:29:14 +05:30
Anand Doshi
384126b550 [fix] has_controller_permissions - return None if function could not decide on True or False 2016-02-15 13:26:23 +05:30
Rushabh Mehta
8c5c6bad14 [minor] added throw option to frappe.has_permission 2015-11-30 15:10:24 +05:30
Saurabh
161c7b3d5f [fixes] update share permissions 2015-10-26 16:50:05 +05:30
Rushabh Mehta
bedf04a5f4 [fixes] file manager, attachments go to 'Attachments' folder and permission + cleanups 2015-09-21 15:43:32 +05:30
Anand Doshi
0f00c63801 [major fix] Restrict apply user permissions if user permissions list if empty. Fixes frappe/erpnext#3194 2015-09-07 14:58:53 +05:30
Anand Doshi
7b1bf1d60c [minor] added comment 2015-09-02 15:05:10 +05:30
Anand Doshi
ef961a091f permissions.get_role_permissions: resolving conflict between Apply User Permissions and If Owner
Case 1:
If atleast one record having both Apply User Permission and If Owner unchecked is found, don't match for those rights

Case 2:
If one row has only "Apply User Permissions" checked and another has only "If Owner" checked,
set Apply User Permissions as checked
2015-09-02 13:31:37 +05:30
Anand Doshi
bcafb56432 [fix] Added Share in Role Permissions Manager. Validate Share permission before adding/updating share 2015-08-04 15:47:59 +05:30
Anand Doshi
f2d3a6ef9b Implemented 'If Owner' in Role Permissions 2015-07-24 12:17:30 +05:30
Anand Doshi
d70968dbc5 [feature] Share with Everyone 2015-07-17 19:41:32 +05:30
Nabin Hait
6d7c1da29e [perms] allow email/print if has read access via share 2015-06-09 14:57:25 +05:30
Rushabh Mehta
3fb635532f [fixes] test case, send to sender if in recipients, undefined in notes, permission test case fix, remove guest permission from blog post 2015-04-29 11:21:13 +05:30
Rushabh Mehta
3182e9ab5b [fix] shared 2015-04-28 19:24:30 +05:30
Rushabh Mehta
99c55650cf [perm] fixes for user permissions 2015-04-14 15:53:55 +05:30
Anand Doshi
05fe53c404 Merge remote-tracking branch 'frappe/v4.x.x' into develop
Conflicts:
	frappe/__version__.py
	frappe/core/doctype/comment/comment.py
	frappe/hooks.py
	frappe/model/db_query.py
	frappe/print/doctype/print_format/print_format.py
	frappe/utils/__init__.py
	requirements.txt
	setup.py
2015-04-06 12:05:50 +05:30
Anand Doshi
38dc29120a Fixed User Permissions for listing and report 2015-03-23 15:25:24 +05:30
Nabin Hait
e6358065ba Merged develop into v5 2015-03-17 10:57:01 +05:30
Anand Doshi
5ae047c82f [fix] user permission doctypes should be collated per perm type 2015-03-16 15:53:41 +05:30
Anand Doshi
2995f02f3b Web Notes to Frappe, better alerts, css fixes, fixed splash 2015-03-03 15:09:34 +05:30
Rushabh Mehta
3de9225a3a [fixes] for share frappe/erpnext#2859 2015-03-02 18:07:51 +05:30
Rushabh Mehta
7cad548270 [tests] 2015-02-21 22:37:35 +05:30
Rushabh Mehta
756af9af97 [share] completes #992 2015-02-05 17:26:23 +05:30
Rushabh Mehta
4310b20679 [sharing] added ui-wip 2015-02-04 18:27:42 +05:30
Rushabh Mehta
8cde7bfc23 [print] tables & [feature] share #992 2015-02-04 17:01:46 +05:30
Rushabh Mehta
812a969c54 [welcome] redis, refactored cache and notification count 2014-12-26 12:50:45 +05:30
Rushabh Mehta
925543e619 [fix] reset_perms 2014-11-26 12:33:00 +05:30
Anand Doshi
ea8b7c9934 [fixes] Permission 2014-09-05 15:14:07 +05:30
Anand Doshi
f233760081 User Permission DocTypes: Apply OR logic when multiple applicable roles have different sets of User Permission DocTypes 2014-08-29 11:45:20 +05:30
Anand Doshi
e01a0600f1 Handle conflicting User Permission DocTypes and DocPerm translations 2014-08-27 14:52:06 +05:30
Anand Doshi
6611c12662 Select Document Types for applying User Permissions 2014-08-26 19:33:58 +05:30
Anand Doshi
1d291a6af6 [minor] frappe.permissions.apply_user_permissions - Check if apply_user_permissions is checked for a doctype, perm type, user combination 2014-07-25 14:56:52 +05:30
Anand Doshi
fc91ee8512 Minor fixes 2014-07-07 16:17:24 +05:30
Anand Doshi
709734d3ac Enable Outgoing Email Settings, Message optional in Add User Permission 2014-07-04 15:41:50 +05:30
Rushabh Mehta
a1a9ae0ed6 bugfixes for permission, fixes frappe/erpnext#1855 2014-06-30 16:53:07 +05:30
Anand Doshi
16073efa61 hotfix in permission 2014-06-24 16:32:25 +05:30
Anand Doshi
0eb5e8120f Fixes for apply user permissions and momentjs 2014-06-04 18:12:57 +05:30
Anand Doshi
2b2a608bab Apply User Permissions optional in script and query report, option to pass user in has_permission 2014-06-04 17:54:43 +05:30