Merge pull request #1689 from learning-unlimited/mgersh-dead-code

Various dead code removal

Author: benjaminjkraft

esp/esp/program/models/__init__.py

@@ -111,31 +111,6 @@ def getFriendlyName(self):
         """ Return a human-readable name that identifies this Program Module """
         return self.admin_title
 
-    def getSummaryCalls(self):
-        """
-        Returns a list of the summary view functions for the specified module
-
-        Only returns functions that are both listed in summary_calls,
-        and that are valid functions for this class.
-
-        Returns an empty list if no calls are found.
-        """
-        callNames = this.summary_calls.split(',')
-
-        calls = []
-        myClass = this.getPythonClass()
-
-             
-
-        for i in callNames:
-            try:
-                calls.append(getattr(myClass, i))
-            except:
-                pass
-
-        return calls
-
-
     def getPythonClass(self):
         """
         Gets the Python class that's associated with this ProgramModule database record
@@ -1284,10 +1259,6 @@ def confirmStudentReg(self, user):
         if records.count() == 0:
             record = Record.objects.create(user=self.user, event="reg_confirmed", program=self.program)
 
-    def cancelStudentRegConfirmation(self, user):
-        """ Cancel the registration confirmation for the specified student """
-        raise ESPError("Error: You can't cancel a registration confirmation!  Confirmations are final!")
-        
     def save(self, *args, **kwargs):
         """ update the timestamp and clear getLastProfile cache """
         self.last_ts = datetime.now()

esp/esp/program/modules/handlers/adminclass.py

@@ -193,92 +193,6 @@ def reviewClass(self, request, tl, one, two, module, extra, prog):
 
         return HttpResponse('')
 
-    @aux_call
-    @needs_admin
-    def attendees(self, request, tl, one, two, module, extra, prog):
-        """ Mark students as having attended the program, or as having registered for the specified class """
-        saved_record = False
-        
-        if request.method == 'POST':
-            if not( request.POST.has_key('class_id') and request.POST.has_key('ids_to_enter') ):
-                raise ESPError("Error: The server lost track of your data!  Please go back to the main page of this feature and try entering it again.")
-
-            usernames = []
-            ids = []
-
-            for id in [ x for x in request.POST['ids_to_enter'].split('\n') if x.strip() != '' ]:
-                try: # We're going to accept both usernames and user ID's.
-                     # Assume that valid integers are user ID's
-                     # and things that aren't valid integers are usernames.
-                    if id[0] == '0':
-                        id_trimmed = id.strip()[:-1]
-                    else:
-                        id_trimmed = id
-                    
-                    id_val = int(id_trimmed)
-                    ids.append(id_val)
-                except ValueError:
-                    usernames.append( id.strip() )
-                    
-            Q_Users = Q(id=-1) # in case usernames and ids are both empty
-            if usernames:
-                Q_Users |= Q(username__in = usernames)
-
-            if ids:
-                Q_Users |= Q(id__in = ids)
-                    
-            users = ESPUser.objects.filter( Q_Users )
-
-            if request.POST['class_id'] == 'program':
-                already_registered_users = prog.students()['attended']
-            else:
-                cls = ClassSection.objects.get(id = request.POST['class_id'])
-                already_registered_users = cls.students()
-
-            already_registered_ids = [ i.id for i in already_registered_users ]
-                                               
-            new_attendees = ESPUser.objects.filter( Q_Users )
-            if already_registered_ids != []:
-                new_attendees = new_attendees.exclude( id__in = already_registered_ids )
-            new_attendees = new_attendees.distinct()
-
-            no_longer_attending = ESPUser.objects.filter( id__in = already_registered_ids )
-            if ids != [] or usernames != []:
-                no_longer_attending = no_longer_attending.exclude( Q_Users )
-            no_longer_attending = no_longer_attending.distinct()
-
-            if request.POST['class_id'] == 'program':
-                for stu in no_longer_attending:
-                    prog.cancelStudentRegConfirmation(stu)
-                for stu in new_attendees:
-                    prog.confirmStudentReg(stu)
-            else:
-                for stu in no_longer_attending:
-                    cls.unpreregister_student(stu)
-                for stu in new_attendees:
-                    cls.preregister_student(stu, overridefull=True)
-                    
-            saved_record = True
-        else:
-            if request.GET.has_key('class_id'):
-                if request.GET['class_id'] == 'program':
-                    is_program = True
-                    registered_students = prog.students()['attended']
-                else:
-                    is_program = False
-                    cls = ClassSection.objects.get(id = request.GET['class_id'])
-                    registered_students = cls.students()
-
-                context = { 'is_program': is_program,
-                            'prog': prog,
-                            'cls': cls,
-                            'registered_students': registered_students,
-                            'class_id': request.GET['class_id'] }
-                    
-                return render_to_response(self.baseDir()+'attendees_enter_users.html', request, context)
-
-        return render_to_response(self.baseDir()+'attendees_selectclass.html', request, { 'saved_record': saved_record, 'prog': prog })
-        
     @aux_call
     @needs_admin
     def deletesection(self, request, tl, one, two, module, extra, prog):
@@ -482,22 +396,6 @@ def changeoption(self, request,tl,one,two,module,extra,prog):
 
         return self.goToCore(tl)
 
-    @needs_admin
-    def main(self, request, tl, one, two, module, extra, prog):
-        """ Display a teacher eg page """
-        context = {}
-        modules = self.program.getModules(request.user, 'manage')
-        
-        for module in modules:
-            context = module.prepare(context)
-
-                    
-        context['modules'] = modules
-        context['one'] = one
-        context['two'] = two
-
-        return render_to_response(self.baseDir()+'mainpage.html', request, context)
-
     @aux_call
     @needs_admin
     def deleteclass(self, request, tl, one, two, module, extra, prog):

esp/esp/seltests/seltests.py

@@ -1,5 +1,5 @@
 from django_selenium.testcases import SeleniumTestCase
-from esp.seltests.util import try_ajax_login, try_normal_login, logout
+from esp.seltests.util import try_normal_login, logout
 from esp.users.models import ESPUser
 from esp.utils.models import TemplateOverride
 
@@ -41,36 +41,7 @@ def setUpNormalLogin(self):
              """
         to.save()
 
-    def setUpAjaxLogin(self):
-        if(self.good_version == -1):
-             to, created = TemplateOverride.objects.get_or_create(name='index.html', version=1)
-        else:
-             to = TemplateOverride.objects.filter(name='index.html')[0]
-        to.content = """
-             {% extends "elements/html" %}
-
-             {% block body %}
-             {% include "users/loginbox_ajax.html" %}
-             {% endblock %}
-             """
-        to.save()
-
     def test_csrf_delete(self):
-        # First set up and test AJAX login
-        self.setUpAjaxLogin()
-
-        self.open_url("/")
-        try_ajax_login(self, "student", "student")
-        self.failUnless(self.is_text_present('Student Student'))
-        logout(self)
-
-        self.delete_cookie("esp_csrftoken")
-
-        try_ajax_login(self, "student", "student")
-        self.failUnless(self.is_text_present('Student Student'))
-        logout(self)
-
-
         # Now set up and test normal login
         self.setUpNormalLogin()
         self.open_url("/") # Load index

esp/esp/seltests/util.py

@@ -3,14 +3,6 @@
 
 def noActiveAjaxJQuery(driver):
     return driver.execute_script("return $j.active == 0")
-def waitForAjaxJQuery(driver):
-    while(not noActiveAjaxJQuery(driver)):
-        time.sleep(1)
-def noActiveAjaxForms(driver):
-    return driver.execute_script("return numAjaxConnections == 0")
-def waitForAjaxForms(driver):
-    while(not noActiveAjaxForms(driver)):
-        time.sleep(1)
 
 def try_login(driver, username, password):
     elem = WebDriverWait(driver, 10).until(
@@ -25,19 +17,6 @@ def try_normal_login(driver, username, password):
     try_login(driver, username, password)
     driver.open_url("/")
 
-def try_ajax_login(driver, username, password):
-    try_login(driver, username, password)
-    try:
-        WebDriverWait(driver, 10).until(noActiveAjaxForms)
-    except Exception as exc:
-        exc_type = type(exc)
-        message = exc.message
-        if message:
-            message += "\n"
-        message += "Wait for ajax login timed out."
-        raise exc_type(message)
-    driver.open_url("/")
-
 def logout(driver):
     driver.open_url("/myesp/signout/")
     driver.open_url("/")

esp/esp/users/lighttpd_trac_auth.py

@@ -129,10 +129,6 @@ def save(self, *args, **kwargs):
 class ESPUserManager(Manager):
     pass
 
-def get_studentreg_model():
-    from esp.program.models import StudentRegistration
-    return StudentRegistration
-
 class ESPUser(User, AnonymousUser):
     """ Create a user of the ESP Website
     This user extends the auth.User of django"""

esp/esp/users/models/__init__.py

@@ -309,12 +309,6 @@ def runTest(self):
         for key in self.keys:
             self.assertTrue(content.has_key(key), "Key %s missing from Ajax response to %s" % (key, self.path))
 
-class AjaxLoginExistenceTest(AjaxExistenceChecker):
-    def __init__(self, *args, **kwargs):
-        super(AjaxLoginExistenceTest, self).__init__(*args, **kwargs)
-        self.path = '/myesp/ajax_login/'
-        self.keys = ['loginbox_html']
-        
 class AjaxScheduleExistenceTest(AjaxExistenceChecker, ProgramFrameworkTest):
     def runTest(self):
         self.path = '/learn/%s/ajax_schedule' % self.program.getUrlBase()

esp/esp/users/tests.py

@@ -3,7 +3,6 @@
 from esp.users.views.registration import GradeChangeRequestView
 
 urlpatterns = patterns('esp.users.views',
-                       (r'^ajax_login/?', 'ajax_login'),
                        (r'^register/?$', 'user_registration_phase1',),
                        (r'^register/information/?$', 'user_registration_phase2'),
                        (r'^activate/?$', 'registration.activate_account',),

esp/esp/users/urls.py

@@ -97,44 +97,6 @@ def login_checked(request, *args, **kwargs):
     return reply
 
 
-def ajax_login(request, *args, **kwargs):
-    import simplejson as json
-    from django.contrib.auth import authenticate
-    from django.template.loader import render_to_string
-
-    username = None
-    password = None
-    if request.method == 'POST':
-        username = request.POST['username']
-        password = request.POST['password']
-
-    username = filter_username(username, password)
-
-    user = authenticate(username=username, password=password)
-    if user is not None:
-        if user.is_active:
-            result_str = 'Login successful'
-            user, forwarded = UserForwarder.follow(ESPUser(user))
-            if forwarded:
-                result_str = 'Logged in as "%s" ("%s" is marked as a duplicate account)' % (user.username, username)
-            auth_login(request, user)
-        else:
-            result_str = 'Account disabled'
-    else:
-        result_str = 'Invalid username or password'
-        
-    request.user = ESPUser(user)
-    content = render_to_string('users/loginbox_content.html', RequestContext(request, {'request': request, 'login_result': result_str}))
-    result_dict = {'loginbox_html': content}
-    
-    if request.user.isAdministrator():
-        admin_home_url = Tag.getTag('admin_home_page')
-        if admin_home_url:
-            result_dict['script'] = render_to_string('users/loginbox_redirect.js', {'target': admin_home_url})
-
-    return HttpResponse(json.dumps(result_dict))
-
-
 def signout(request):
     """ This view merges Django's logout view with our own "Goodbye" message. """
     auth_logout(request)