Changeset 14648 for main


Ignore:
Timestamp:
23 Mar 2017, 04:43:44 (8 years ago)
Author:
Henrik Bettermann
Message:

Redirect to manage page after editing of certificate courses.

Location:
main/waeup.kofa/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.kofa/trunk/CHANGES.txt

    r14642 r14648  
    441.6.dev0 (unreleased)
    55=======================
     6
     7* Redirect to manage page after editing of certificate courses.
    68
    79* Add `course_category` attribute to course tickets. In the base package,

  • main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py

    r14646 r14648  
    25772577    doclink = DOCLINK + '/academics.html#certificate-courses'
    25782578
    2579     @action(_('Save and return'), style='primary')
    2580     def saveAndReturn(self, **data):
     2579    @action(_('Save'), style='primary')
     2580    def save(self, **data):
    25812581        parent = self.context.__parent__
    25822582        if self.context.level == data['level']:
    … …  
    25872587            old_level = self.context.level
    25882588            data['course'] = self.context.course
    2589             parent.addCertCourse(**data)
     2589            try:
     2590                parent.addCertCourse(**data)
     2591            except KeyError:
     2592                self.flash(_('The chosen certificate course is already '
     2593                             'part of this certificate.'), type='warning')
     2594                return
    25902595            parent.delCertCourses(data['course'].code, level=old_level)
    25912596            self.flash(_('Form has been saved.'))
    … …  
    25952600            grok.getSite().logger.info(
    25962601                '%s - renamed: %s to %s' % (ob_class, old_code, new_code))
    2597         self.redirect(self.url(parent))
     2602            self.redirect(self.url(parent) + '/%s_%s/@@manage' % (
     2603                data['course'].code, data['level']))
    25982604        return
    25992605

  • main/waeup.kofa/trunk/src/waeup/kofa/doctests/pages.txt

    r13657 r14648  
    10961096If we just click 'Save and return' nothing will change:
    10971097
    1098   >>> browser.getControl("Save and return").click()
    1099   >>> browser.getLink('COURSE1_100').click()
     1098  >>> browser.getControl("Save").click()
    11001099  >>> browser.url
    1101   'http://localhost/myun.../TF/TD/certificates/CERT1/COURSE1_100'
    1102 
    1103 Let's set a new level (it was 100 before) and save the form. This will
    1104 bring us to the certificate index page afterwards:
    1105 
    1106   >>> browser.open(cert_url + '/COURSE1_100/manage')
     1100  'http://localhost/myun.../TF/TD/certificates/CERT1/COURSE1_100/@@manage'
     1101
     1102Let's set a new level (it was 100 before) and save the form. The entire
     1103certificate course will be replaced and we will be redirected to manage
     1104page afterwards:
     1105
    11071106  >>> browser.getControl(name='form.level').value = ['200']
    1108   >>> browser.getControl("Save and return").click()
    1109 
    1110 As we changed the level, also the URL will change:
    1111 
    1112   >>> browser.getLink('COURSE1_200').click()
     1107  >>> browser.getControl("Save").click()
     1108  >>> browser.url
     1109  'http://localhost/myun.../TF/TD/certificates/CERT1/COURSE1_200/@@manage'
     1110
     1111Nothing will be changed if click ``Cancel``:
     1112
     1113  >>> browser.getControl(name='form.level').value = ['400']
     1114  >>> browser.getControl('Cancel').click()
    11131115  >>> browser.url
    11141116  'http://localhost/myun.../TF/TD/certificates/CERT1/COURSE1_200'
    1115 
    1116 If we go to the settings page and click ``Cancel`` nothing will be
    1117 changed:
    1118 
    1119   >>> browser.getLink('Edit certificate course').click()
    1120   >>> browser.getControl(name='form.level').value = ['400']
    1121   >>> browser.getControl('Cancel').click()
    1122 
    1123 Our certcourse provides a new level of 200 and not 400:
    1124 
    1125   >>> browser.open(cert_url + '/COURSE1_200')
    1126   >>> print browser.contents
    1127   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
    1128   ...<td>Level:</td>
    1129   ...<td>200 (Year 2)</td>
    1130   ...
    11311117
    11321118Searching certificate courses
Note: See TracChangeset for help on using the changeset viewer.