deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-10 22:53:34 +00:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Allow user to request notifications when adding printer ACL (#585)

Browse Source
This commit is contained in:
Ross Scroggs
2017-09-16 17:05:44 -07:00
committed by Jay Lee
parent 6be6b2ebde
commit d667da4851
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/GamCommands.txt
View File

@ -827,7 +827,7 @@ gam delete printer <PrinterID>
gam info printer <PrinterID> [everything] gam info printer <PrinterID> [everything]
gam print printers [todrive] [query <QueryPrinter>] [type <String>] [status <String>] [extrafields <String>] gam print printers [todrive] [query <QueryPrinter>] [type <String>] [status <String>] [extrafields <String>]
gam printer <PrinterID> add user|manager|owner <EmailAddress>|[domain:]<DomainName>|public gam printer <PrinterID> add user|manager|owner <EmailAddress>|[domain:]<DomainName>|public [notify]
gam printer <PrinterID> delete <EmailAddress>|[domain:]<DomainName>|public gam printer <PrinterID> delete <EmailAddress>|[domain:]<DomainName>|public
gam printer <PrinterID> showacl gam printer <PrinterID> showacl
gam printjob <PrintJobID> cancel gam printjob <PrintJobID> cancel

3
src/gam.py
View File

@ -2893,6 +2893,7 @@ def doPrinterAddACL():
printer = sys.argv[2] printer = sys.argv[2]
role = sys.argv[4].upper() role = sys.argv[4].upper()
scope = sys.argv[5] scope = sys.argv[5]
notify = True if len(sys.argv) > 6 and sys.argv[6].lower() == u'notify' else False
public = None public = None
skip_notification = True skip_notification = True
if scope.lower() == u'public': if scope.lower() == u'public':
@ -2902,6 +2903,8 @@ def doPrinterAddACL():
skip_notification = None skip_notification = None
elif scope.find(u'@') == -1: elif scope.find(u'@') == -1:
scope = u'/hd/domain/%s' % scope scope = u'/hd/domain/%s' % scope
else:
skip_notification = not notify
result = callGAPI(cp.printers(), u'share', printerid=printer, role=role, scope=scope, public=public, skip_notification=skip_notification) result = callGAPI(cp.printers(), u'share', printerid=printer, role=role, scope=scope, public=public, skip_notification=skip_notification)
checkCloudPrintResult(result) checkCloudPrintResult(result)
who = scope who = scope