[Commits] (morgen) Combined the two dialogs for publishing a collection into one. Email address

[commits at osafoundation.org]

Commit by: morgen
Modified files:
chandler/application/dialogs/PublishCollection.py None 1.1
chandler/application/dialogs/PublishCollection.wdr None 1.1
chandler/application/dialogs/PublishCollection_wdr.xrc None 1.1
chandler/parcels/osaf/framework/sharing/Sharing.py 1.6 1.7

Log message:
Combined the two dialogs for publishing a collection into one.  Email address
"validation" is done before publishing.


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/application/dialogs/PublishCollection.py?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/chandler/application/dialogs/PublishCollection.wdr?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/chandler/application/dialogs/PublishCollection_wdr.xrc?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/sharing/Sharing.py.diff?r1=text&tr1=1.6&r2=text&tr2=1.7

Index: chandler/parcels/osaf/framework/sharing/Sharing.py
diff -u chandler/parcels/osaf/framework/sharing/Sharing.py:1.6 chandler/parcels/osaf/framework/sharing/Sharing.py:1.7
--- chandler/parcels/osaf/framework/sharing/Sharing.py:1.6	Wed Aug 25 10:31:41 2004
+++ chandler/parcels/osaf/framework/sharing/Sharing.py	Wed Aug 25 12:16:07 2004
@@ -1,12 +1,14 @@
-__version__ = "$Revision: 1.6 $"
-__date__ = "$Date: 2004/08/25 17:31:41 $"
+__version__ = "$Revision: 1.7 $"
+__date__ = "$Date: 2004/08/25 19:16:07 $"
 __copyright__ = "Copyright (c) 2004 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
 import application.Globals as Globals
 import application.Parcel
 import osaf.framework.webdav.Dav
+import osaf.mail.message
 from repository.util.UUID import UUID
+import application.dialogs.PublishCollection
 
 SHARING = "http://osafoundation.org/parcels/osaf/framework/sharing"
 EVENTS = "http://osafoundation.org/parcels/osaf/framework/blocks/Events"
@@ -51,10 +53,8 @@
 def sendInvites(addresses, url):
     """ Tell the email subsystem to send a sharing invite to the given
         addresses. """
-    for address in addresses:
-        print address
-    # validate the addresses
-    # parcels.osaf.mail.sharing.<sendinvite>(address, url)
+    # osaf.mail.sharing.<sendinvite>(address, url)
+    pass
 
 def manualSubscribeToCollection():
     """ Display a dialog box prompting the user for a webdav url to 
@@ -67,19 +67,8 @@
         subscribeToWebDavCollection(url)
 
 def manualPublishCollection(collection):
-    print 'Share collection "%s"' % collection.displayName
-    url = application.dialogs.Util.promptUser( \
-     Globals.wxApplication.mainFrame, "Publish Collection...",
-     "URL to publish collection to:",
-     "http://code-bear.com/dav/%s" % collection.itsUUID)
-    if url is not None:
-        addresses = application.dialogs.Util.promptUser( \
-         Globals.wxApplication.mainFrame, "Publish Collection...",
-         "Email address to send invites: (comma separated)", "")
-        osaf.framework.webdav.Dav.DAV(url).put(collection)
-        if addresses is not None:
-            addresses = addresses.split(",")
-            sendInvites(addresses, url)
+    application.dialogs.PublishCollection.ShowPublishCollectionsDialog( \
+     Globals.wxApplication.mainFrame, collection)
 
 def syncCollection(collection):
     if collection.hasAttributeValue('sharedURL'):