Changeset 9211 for main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/browser/pages.py

Timestamp:

21 Sep 2012, 08:19:35 (12 years ago)

Author:

uli

Message:

Rollback r9209. Looks like multiple merges from trunk confuse svn when merging back into trunk.

Location:

main/waeup.kofa/branches/uli-zc-async

Files:

• . (modified) (1 prop)
• src/waeup/kofa/browser/pages.py (modified) (25 diffs)

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/browser/pages.py

@@ -18 +18 @@
 """ Viewing components for Kofa objects.
 """
+import copy
 import csv
 import grok
@@ -23 +24 @@
 import re
 import sys
-from urllib import urlencode
+import time
+import re
 from zope import schema
 from zope.authentication.interfaces import (
@@ -32 +34 @@
     getUtilitiesFor,
     )
+#from zope.component.interfaces import Invalid
 from zope.event import notify
-from zope.securitypolicy.interfaces import IPrincipalRoleManager
+from zope.securitypolicy.interfaces import (
+    IPrincipalRoleManager, IPrincipalRoleMap)
 from zope.session.interfaces import ISession
-from zope.password.interfaces import IPasswordManager
 from waeup.kofa.browser.layout import (
     KofaPage, KofaForm, KofaEditFormPage, KofaAddFormPage,
@@ -46 +49 @@
 from waeup.kofa.browser.layout import jsaction, action, UtilityView
 from waeup.kofa.browser.resources import (
-    warning, tabs, datatable)
+    warning, datepicker, tabs, datatable, page_reloader, page_not_reloader)
 from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.interfaces import(
@@ -61 +64 @@
 from waeup.kofa.university.vocabularies import course_levels
 from waeup.kofa.authentication import LocalRoleSetEvent
+#from waeup.kofa.widgets.restwidget import ReSTDisplayWidget
 from waeup.kofa.widgets.htmlwidget import HTMLDisplayWidget
-from waeup.kofa.utils.helpers import get_user_account
-from waeup.kofa.mandates.mandate import PasswordMandate
+from waeup.kofa.authentication import get_principal_role_manager
+from waeup.kofa.utils.helpers import get_user_account, msave
 
 grok.context(IKofaObject)
@@ -152 +156 @@
     return
 
-# Save function used for save methods in pages
-def msave(view, **data):
-    changed_fields = view.applyData(view.context, **data)
-    # Turn list of lists into single list
-    if changed_fields:
-        changed_fields = reduce(lambda x,y: x+y, changed_fields.values())
-    fields_string = ' + '.join(changed_fields)
-    view.flash(_('Form has been saved.'))
-    ob_class = view.__implemented__.__name__.replace('waeup.kofa.','')
-    if fields_string:
-        grok.getSite().logger.info('%s - %s - saved: %s' % (ob_class, view.context.__name__, fields_string))
-    return
-
 #
 # Login/logout and language switch pages...
@@ -201 +192 @@
                 self.redirect(self.camefrom)
                 return
-            # Display appropriate flash message if credentials are correct
-            # but student has been deactivated.
-            login = self.request.form['form.login']
-            if len(login) == 8 and grok.getSite()['students'].has_key(login):
-                student = grok.getSite()['students'][
-                    self.request.form['form.login']]
-                password = self.request.form['form.password']
-                passwordmanager = getUtility(IPasswordManager, 'SSHA')
-                if passwordmanager.checkPassword(student.password, password):
-                    self.flash(_('Your account has been deactivated.'))
-                    return
-            self.flash(_('You entered invalid credentials.'))
+            self.flash(_('You entered wrong credentials.'))
 
 
@@ -392 +372 @@
     def entries(self):
         return ()
+
+class ReindexPage(UtilityView, grok.View):
+    """ Reindex view.
+
+    Reindexes a catalog. For managers only.
+    """
+    grok.context(IUniversity)
+    grok.name('reindex')
+    grok.require('waeup.managePortal')
+
+    def update(self,ctlg=None):
+        if ctlg is None:
+            self.flash('No catalog name provided.')
+            return
+        cat = queryUtility(ICatalog, name='%s_catalog' % ctlg)
+        if cat is None:
+            self.flash('%s_catalog does not exist' % ctlg)
+            return
+        self.context.logger.info(
+            'Catalog `%s_catalog` re-indexing started.' % ctlg)
+        cat.updateIndexes()
+        no_of_entries = cat.values()[0].documentCount()
+        self.flash('%d %s re-indexed.' % (no_of_entries,ctlg))
+        self.context.logger.info(
+            'Re-indexing of %d objects finished.' % no_of_entries)
+        return
+
+    def render(self):
+        self.redirect(self.url(self.context, '@@index'))
+        return
 
 #
@@ -791 +801 @@
     def delFiles(self, **data):
         form = self.request.form
+        logger = self.context.logger
         if form.has_key('val_id'):
             child_id = form['val_id']
@@ -815 +826 @@
         return
 
-class DatacenterFinishedPage(KofaEditFormPage):
-    grok.context(IDataCenter)
-    grok.name('processed')
-    grok.require('waeup.manageDataCenter')
-    label = _(u'Processed Files')
-    pnav = 0
-
-    def update(self):
-        datatable.need()
-        return super(DatacenterFinishedPage, self).update()
-
 class DatacenterUploadPage(KofaPage):
     grok.context(IDataCenter)
     grok.name('upload')
     grok.require('waeup.manageDataCenter')
-    label = _(u'Upload portal data as CSV file')
+    label = _(u'Upload file')
     pnav = 0
     upload_button =_(u'Upload')
@@ -849 +849 @@
                 self.flash(_("Only csv files are allowed."))
                 return
-            normalized_filename = self.getNormalizedFileName(filename)
-            finished_file = os.path.join(
-                self.context.storage, 'finished', normalized_filename)
-            unfinished_file = os.path.join(
-                self.context.storage, 'unfinished', normalized_filename)
-            if os.path.exists(finished_file) or os.path.exists(unfinished_file):
-                self.flash(_("File with same name was uploaded earlier."))
-                return
-            target = os.path.join(self.context.storage, normalized_filename)
+            target = os.path.join(self.context.storage,
+                                  self.getNormalizedFileName(filename))
             open(target, 'wb').write(uploadfile.read())
             os.chmod(target, 0664)
@@ -888 +881 @@
         return '%s_%s%s' % (base, filtered_username, ext.lower())
 
-    def getImporters(self):
-        importers = getAllUtilitiesRegisteredFor(IBatchProcessor)
-        importer_props = []
-        for x in importers:
-            iface_fields = schema.getFields(x.iface)
-            available_fields = []
-            for key in iface_fields.keys():
-                iface_fields[key] = (iface_fields[key].__class__.__name__,
-                    iface_fields[key].required)
-            for value in x.available_fields:
-                available_fields.append(
-                    dict(f_name=value,
-                         f_type=iface_fields.get(value, (None, False))[0],
-                         f_required=iface_fields.get(value, (None, False))[1]
-                         )
-                    )
-            available_fields = sorted(available_fields, key=lambda k: k['f_name'])
-            importer_props.append(
-                dict(title=x.name, name=x.util_name, fields=available_fields))
-        return sorted(importer_props, key=lambda k: k['title'])
-
 class FileDownloadView(UtilityView, grok.View):
     grok.context(IDataCenter)
@@ -925 +897 @@
             'Content-Type', 'text/csv; charset=UTF-8')
         self.response.setHeader(
-            'Content-Disposition:', 'attachment; filename="%s' %
-            self.filename.replace('finished/',''))
+            'Content-Disposition:', 'attachment; filename="%s.csv' %
+            self.filename.replace('.csv',''))
         fullpath = os.path.join(self.context.storage, self.filename)
         return open(fullpath, 'rb').read()
-
-class SkeletonDownloadView(UtilityView, grok.View):
-    grok.context(IDataCenter)
-    grok.name('skeleton')
-    grok.require('waeup.manageDataCenter')
-
-    def update(self, processorname=None):
-        self.processorname = self.request.form['name']
-        self.filename = ('%s_000.csv' %
-            self.processorname.replace('processor','import'))
-        return
-
-    def render(self):
-        #ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
-        #self.context.logger.info(
-        #    '%s - skeleton downloaded: %s' % (ob_class, self.filename))
-        self.response.setHeader(
-            'Content-Type', 'text/csv; charset=UTF-8')
-        self.response.setHeader(
-            'Content-Disposition:', 'attachment; filename="%s' % self.filename)
-        processor = getUtility(IBatchProcessor, name=self.processorname)
-        csv_data = processor.get_csv_skeleton()
-        return csv_data
 
 class DatacenterImportStep1(KofaPage):
@@ -965 +914 @@
 
     def getFiles(self):
-        files = self.context.getPendingFiles(sort='date')
+        files = self.context.getFiles(sort='date')
         for file in files:
             name = file.name
@@ -1189 +1138 @@
         return False
 
+    @property
+    def nextstep(self):
+        return self.url(self.context, '@@import4')
+
     def update(self, headerfield=None, back2=None, cancel=None, proceed=None):
         datatable.need()
@@ -1409 +1362 @@
            string representing the exporter title used when triggering
            the export job.
+
+        Calling this method also installs a JavaScript page reloader
+        that reloads the page after some time (1.5 secs), if there is
+        a running export that is not completed yet.
+
+        The method caches results.
         """
         if self._running_exports is None:
@@ -1416 +1375 @@
     def _getRunningExports(self):
         result = self.context.get_export_jobs_status(self.user_id)
+        uncompleted = [x for x in result if x[0] != 'completed']
+        #if len(uncompleted):
+        #    page_reloader.need()
+        #else:
+        #    page_not_reloader.need()
         return result
 
@@ -1462 +1426 @@
             return
         result = open(path, 'rb').read()
-        acronym = grok.getSite()['configuration'].acronym.replace(' ','')
-        filename = "%s_%s" % (acronym, os.path.basename(path))
         self.response.setHeader(
             'Content-Type', 'text/csv; charset=UTF-8')
-        self.response.setHeader(
-            'Content-Disposition', 'attachment; filename="%s' % filename)
         # remove job and running_exports entry from context
         self.context.delete_export_entry(
@@ -2027 +1987 @@
     grok.template('certificatemanagepage')
     taboneactions = [_('Save'),_('Cancel')]
-    tabtwoactions = [_('Add certificate course'),
-                     _('Remove selected certificate courses'),_('Cancel')]
+    tabtwoactions = [_('Add course referrer'),
+                     _('Remove selected course referrers'),_('Cancel')]
     tabthreeactions1 = [_('Remove selected local roles')]
     tabthreeactions2 = [_('Add local role')]
@@ -2051 +2011 @@
         return msave(self, **data)
 
-    @jsaction(_('Remove selected certificate courses'))
+    @jsaction(_('Remove selected course referrers'))
     def delCertificateCourses(self, **data):
         delSubobjects(self, redirect='@@manage', tab='2')
         return
 
-    @action(_('Add certificate course'), validator=NullValidator)
+    @action(_('Add course referrer'), validator=NullValidator)
     def addCertificateCourse(self, **data):
         self.redirect(self.url(self.context, 'addcertificatecourse'))
@@ -2093 +2053 @@
     form_fields = grok.AutoFields(ICertificateCourseAdd)
     pnav = 1
-    label = _('Add certificate course')
-
-    @action(_('Add certificate course'))
+    label = _('Add course referrer')
+
+    @action(_('Add course referrer'))
     def addCertcourse(self, **data):
         try:
-            self.context.addCertCourse(**data)
+            self.context.addCourseRef(**data)
         except KeyError:
-            self.status = self.flash(_('The chosen certificate course is already '
+            self.status = self.flash(_('The chosen course referrer is already '
                                   'part of this certificate.'))
             return
         self.status = self.flash(
-            _("certificate course ${a}_${b} added.",
+            _("Course referrer ${a}_${b} added.",
             mapping = {'a': data['course'].code, 'b': data['level']}))
         code = "%s_%s" % (data['course'].code, data['level'])
@@ -2145 +2105 @@
     grok.require('waeup.manageAcademics')
     form_fields = grok.AutoFields(ICertificateCourse)
-    label = _('Edit certificate course')
+    label = _('Edit course referrer')
     pnav = 1
 
@@ -2158 +2118 @@
             old_level = self.context.level
             data['course'] = self.context.course
-            parent.addCertCourse(**data)
-            parent.delCertCourse(data['course'].code, level=old_level)
+            parent.addCourseRef(**data)
+            parent.delCourseRef(data['course'].code, level=old_level)
             self.flash(_('Form has been saved.'))
             old_code = "%s_%s" % (data['course'].code, old_level)
@@ -2218 +2178 @@
         return None
 
-    @action(_('Send login credentials to email address'), style='primary')
+    @action(_('Get login credentials'), style='primary')
     def request(self, **data):
         if not self.captcha_result.is_valid:
@@ -2233 +2193 @@
         # Change password
         kofa_utils = getUtility(IKofaUtils)
-        password = kofa_utils.genPassword()
-        mandate = PasswordMandate()
-        mandate.params['password'] = password
-        mandate.params['user'] = user
-        site = grok.getSite()
-        site['mandates'].addMandate(mandate)
-        # Send email with credentials
-        args = {'mandate_id':mandate.mandate_id}
-        mandate_url = self.url(site) + '/mandate?%s' % urlencode(args)
-        url_info = u'Confirmation link: %s' % mandate_url
-        msg = _('You have successfully requested a password for the')
+        pwd = kofa_utils.genPassword()
+        IUserAccount(user).setPassword(pwd)
+        # Send email with new redentials
+        msg = _('You have successfully changed your password for the')
+        login_url = self.url(grok.getSite(), 'login')
         success = kofa_utils.sendCredentials(
-            IUserAccount(user),password,url_info,msg)
+            IUserAccount(user),pwd,login_url,msg)
         if success:
             self.flash(_('An email with your user name and password ' +