← Back to branch summary

~rapache-devel/rapache/development

« back to all changes in this revision

Viewing changes to RapacheGtk/RapacheGui.py

  • Committer: jason
  • Date: 2008-09-24 10:34:25 UTC
  • Revision ID: jason@jason-laptop-20080924103425-s8gxgrjwwidrfheo
fix vhost caching and problem tab

Show diffs side-by-side

added added

removed removed

Lines of Context:
RapacheGtk/RapacheGui.py
451
451
        
452
452
    def edit_button_clicked(self, widget, notused = None, notused2 = None):         
453
453
        vhost = self.vhosts_treeview.get_selected_line()
454
 
        key = vhost.get_name()
455
454
        clone = vhost.clone()
456
 
        clone = self.open_edit_vhost_window( clone )
457
 
        if clone:
458
 
            hosts = self.core.current_server.apache.get_virtual_hosts()
459
 
            hosts[key] = clone
460
 
            self.vhosts_treeview.load(hosts)
461
 
            self.please_restart()
462
 
        
 
455
        self.open_edit_vhost_window( clone )
 
456
 
463
457
    def open_edit_vhost_window(self, vhost):
464
458
        if not vhost.is_editable(): 
465
459
            # Use generic editor instead
473
467
        else:
474
468
            new_vhost_window = VirtualHostWindow ( self )
475
469
            new_vhost_window.load( vhost )
476
 
            vhost = new_vhost_window.run() 
 
470
            vhost = new_vhost_window.run()
477
471
            if vhost and vhost.changed:
478
 
                self.please_restart()   
 
472
                hosts = self.core.current_server.apache.get_virtual_hosts()
 
473
                hosts[vhost.get_name()] = vhost
 
474
                self.vhosts_treeview.load(hosts)
 
475
                self.please_restart()  
479
476
        
480
477
    def delete_button_clicked( self, widget ):
481
478
        vhost = self.vhosts_treeview.get_selected_line()
608
605
        
609
606
    def fix_vhosts(self, widget):        
610
607
        if not self.core.current_server.command.ask_password(): return
611
 
        
612
 
        print "Attempting to fix virtualhosts"
613
 
        items = self.treeview_errors.get_items()
614
 
        for name in items:            
615
 
            normalize_vhost( name )
616
 
        #since they were in the enabled, let's enabl'em again
617
 
        for name in items:
618
 
             if self.vhosts_treeview.items.has_key( name ):            
619
 
                self.vhosts_treeview.items[name].toggle(True)
620
 
            #site.toggle(True)            
621
 
        self.refresh_vhosts()
622
 
        #self.refresh_denormalized_vhosts()
 
608
        self.core.current_server.apache.apply_fixable_errors()
 
609
 
 
610
        errors = self.core.current_server.apache.get_errors(True)
 
611
        self.treeview_errors.load(errors)
 
612
        if len(errors) > 0:
 
613
            self.notebook.get_nth_page(0).show() 
 
614
            self.notebook.set_current_page(0)  
 
615
        else:
 
616
            self.notebook.get_nth_page(0).hide()
 
617
            
 
618
        self.button_resolve_errors.set_sensitive(self.core.current_server.apache.get_fixable_error_count() > 0)
623
619
        self.please_restart()
624
 
        
 
620
               
625
621
    def get_current_vhost(self ):
626
622
        vhost = self.vhosts_treeview.get_selected_line()
627
623
        return vhost