Changeset 10647


Ignore:
Timestamp:
24 Sep 2013, 12:51:11 (11 years ago)
Author:
Henrik Bettermann
Message:

Rename search button.

Location:
main/waeup.kofa/trunk/src/waeup/kofa
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_applicantcopier.py

    r9900 r10647  
    122122        self.browser.getControl(name="searchtype").value = ['depcode']
    123123        self.browser.getControl(name="searchterm").value = 'dep1'
    124         self.browser.getControl("Search").click()
     124        self.browser.getControl("Find student(s)").click()
    125125        self.assertMatches('...John Anthony Tester...', self.browser.contents)
    126126        # Has the student studycourse the correct attributes?

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

    r10637 r10647  
    259259    grok.template('containerpage')
    260260    label = _('Student Section')
    261     search_button = _('Search')
     261    search_button = _('Find student(s)')
    262262    pnav = 4
    263263
    … …  
    303303    pnav = 4
    304304    label = _('Manage student section')
    305     search_button = _('Search')
     305    search_button = _('Find student(s)')
    306306    remove_button = _('Remove selected')
    307307

  • main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/containermanagepage.pt

    r9795 r10647  
    33  <input class="btn primary" type="submit" name="search"
    44    tal:attributes="value view/search_button" />
    5   <span i18n:translate="">for students</span>
    65
    76  <select name="searchtype">

  • main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/containerpage.pt

    r10465 r10647  
    33  <input class="btn primary" type="submit" name="search"
    44    tal:attributes="value view/search_button" />
    5   <span i18n:translate="">for students</span>
    65
    76  <select name="searchtype">

  • main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

    r10646 r10647  
    290290        # We can find a student with a certain student_id
    291291        self.browser.open(self.container_path)
    292         self.browser.getControl("Search").click()
     292        self.browser.getControl("Find student(s)").click()
    293293        self.assertTrue('Empty search string' in self.browser.contents)
    294294        self.browser.getControl(name="searchtype").value = ['student_id']
    295295        self.browser.getControl(name="searchterm").value = self.student_id
    296         self.browser.getControl("Search").click()
     296        self.browser.getControl("Find student(s)").click()
    297297        self.assertTrue('Anna Tester' in self.browser.contents)
    298298
    … …  
    301301        self.browser.getControl(name="searchtype").value = ['current_session']
    302302        self.browser.getControl(name="searchterm").value = '2004'
    303         self.browser.getControl("Search").click()
     303        self.browser.getControl("Find student(s)").click()
    304304        self.assertTrue('Anna Tester' in self.browser.contents)
    305305        # Session fileds require integer values
    … …  
    307307        self.browser.getControl(name="searchtype").value = ['current_session']
    308308        self.browser.getControl(name="searchterm").value = '2004/2005'
    309         self.browser.getControl("Search").click()
     309        self.browser.getControl("Find student(s)").click()
    310310        self.assertTrue('Only year dates allowed' in self.browser.contents)
    311311        self.browser.open(self.manage_container_path)
    312312        self.browser.getControl(name="searchtype").value = ['current_session']
    313313        self.browser.getControl(name="searchterm").value = '2004/2005'
    314         self.browser.getControl("Search").click()
     314        self.browser.getControl("Find student(s)").click()
    315315        self.assertTrue('Only year dates allowed' in self.browser.contents)
    316316
    … …  
    319319        self.browser.getControl(name="searchtype").value = ['current_mode']
    320320        self.browser.getControl(name="searchterm").value = 'ug_ft'
    321         self.browser.getControl("Search").click()
     321        self.browser.getControl("Find student(s)").click()
    322322        self.assertTrue('Anna Tester' in self.browser.contents)
    323323
    … …  
    326326        self.browser.getControl(name="searchtype").value = ['depcode']
    327327        self.browser.getControl(name="searchterm").value = 'dep1'
    328         self.browser.getControl("Search").click()
     328        self.browser.getControl("Find student(s)").click()
    329329        self.assertTrue('Anna Tester' in self.browser.contents)
    330330
    331331        # We can find a student by searching for all kind of name parts
    332332        self.browser.open(self.manage_container_path)
    333         self.browser.getControl("Search").click()
     333        self.browser.getControl("Find student(s)").click()
    334334        self.assertTrue('Empty search string' in self.browser.contents)
    335335        self.browser.getControl(name="searchtype").value = ['fullname']
    336336        self.browser.getControl(name="searchterm").value = 'Anna Tester'
    337         self.browser.getControl("Search").click()
     337        self.browser.getControl("Find student(s)").click()
    338338        self.assertTrue('Anna Tester' in self.browser.contents)
    339339        self.browser.open(self.manage_container_path)
    340340        self.browser.getControl(name="searchtype").value = ['fullname']
    341341        self.browser.getControl(name="searchterm").value = 'Anna'
    342         self.browser.getControl("Search").click()
     342        self.browser.getControl("Find student(s)").click()
    343343        self.assertTrue('Anna Tester' in self.browser.contents)
    344344        self.browser.open(self.manage_container_path)
    345345        self.browser.getControl(name="searchtype").value = ['fullname']
    346346        self.browser.getControl(name="searchterm").value = 'Tester'
    347         self.browser.getControl("Search").click()
     347        self.browser.getControl("Find student(s)").click()
    348348        self.assertTrue('Anna Tester' in self.browser.contents)
    349349        self.browser.open(self.manage_container_path)
    350350        self.browser.getControl(name="searchtype").value = ['fullname']
    351351        self.browser.getControl(name="searchterm").value = 'An'
    352         self.browser.getControl("Search").click()
     352        self.browser.getControl("Find student(s)").click()
    353353        self.assertFalse('Anna Tester' in self.browser.contents)
    354354        self.browser.open(self.manage_container_path)
    355355        self.browser.getControl(name="searchtype").value = ['fullname']
    356356        self.browser.getControl(name="searchterm").value = 'An*'
    357         self.browser.getControl("Search").click()
     357        self.browser.getControl("Find student(s)").click()
    358358        self.assertTrue('Anna Tester' in self.browser.contents)
    359359        self.browser.open(self.manage_container_path)
    360360        self.browser.getControl(name="searchtype").value = ['fullname']
    361361        self.browser.getControl(name="searchterm").value = 'tester'
    362         self.browser.getControl("Search").click()
     362        self.browser.getControl("Find student(s)").click()
    363363        self.assertTrue('Anna Tester' in self.browser.contents)
    364364        self.browser.open(self.manage_container_path)
    365365        self.browser.getControl(name="searchtype").value = ['fullname']
    366366        self.browser.getControl(name="searchterm").value = 'Tester Ana'
    367         self.browser.getControl("Search").click()
     367        self.browser.getControl("Find student(s)").click()
    368368        self.assertFalse('Anna Tester' in self.browser.contents)
    369369        self.browser.open(self.manage_container_path)
    370370        self.browser.getControl(name="searchtype").value = ['fullname']
    371371        self.browser.getControl(name="searchterm").value = 'Tester Anna'
    372         self.browser.getControl("Search").click()
     372        self.browser.getControl("Find student(s)").click()
    373373        self.assertTrue('Anna Tester' in self.browser.contents)
    374374        # The old searchterm will be used again
    375         self.browser.getControl("Search").click()
     375        self.browser.getControl("Find student(s)").click()
    376376        self.assertTrue('Anna Tester' in self.browser.contents)
    377377
    … …  
    381381        self.browser.open(self.manage_container_path)
    382382        self.browser.getControl(name="searchtype").value = ['suspended']
    383         self.browser.getControl("Search").click()
     383        self.browser.getControl("Find student(s)").click()
    384384        self.assertTrue('Anna Tester' in self.browser.contents)
    385385        self.browser.open(self.container_path)
    386386        self.browser.getControl(name="searchtype").value = ['suspended']
    387         self.browser.getControl("Search").click()
     387        self.browser.getControl("Find student(s)").click()
    388388        self.assertTrue('Anna Tester' in self.browser.contents)
    389389
    … …  
    400400        self.browser.getControl(name="searchtype").value = ['current_session']
    401401        self.browser.getControl(name="searchterm").value = '2010'
    402         self.browser.getControl("Search").click()
     402        self.browser.getControl("Find student(s)").click()
    403403        self.assertTrue('Anna Tester' in self.browser.contents)
    404404
    … …  
    409409        self.browser.getControl(name="searchtype").value = ['student_id']
    410410        self.browser.getControl(name="searchterm").value = self.student_id
    411         self.browser.getControl("Search").click()
     411        self.browser.getControl("Find student(s)").click()
    412412        self.assertTrue('No student found' in self.browser.contents)
    413413
    … …  
    415415        self.browser.getControl(name="searchtype").value = ['student_id']
    416416        self.browser.getControl(name="searchterm").value = self.student_id
    417         self.browser.getControl("Search").click()
     417        self.browser.getControl("Find student(s)").click()
    418418        self.assertTrue('No student found' in self.browser.contents)
    419419        return
    … …  
    13351335        self.browser.getControl(name="searchtype").value = ['depcode']
    13361336        self.browser.getControl(name="searchterm").value = 'dep1'
    1337         self.browser.getControl("Search").click()
     1337        self.browser.getControl("Find student(s)").click()
    13381338        self.assertTrue('Aaren Pieri' in self.browser.contents)
    13391339        # We can search for a new student by name ...
    13401340        self.browser.getControl(name="searchtype").value = ['fullname']
    13411341        self.browser.getControl(name="searchterm").value = 'Claus'
    1342         self.browser.getControl("Search").click()
     1342        self.browser.getControl("Find student(s)").click()
    13431343        self.assertTrue('Claus Finau' in self.browser.contents)
    13441344        # ... and check if the imported password has been properly set
    … …  
    20582058        self.browser.open(self.container_path)
    20592059        self.browser.getControl(name="searchtype").value = ['transcript']
    2060         self.browser.getControl("Search").click()
     2060        self.browser.getControl("Find student(s)").click()
    20612061        self.assertTrue('Anna Tester' in self.browser.contents)
    20622062        self.browser.getLink("K1000000").click()
Note: See TracChangeset for help on using the changeset viewer.