Changeset 8221


Ignore:
Timestamp:
Oct 30, 2018, 10:09:15 AM (9 months ago)
Author:
hectorgh
Message:

inverting password logic

Location:
zero-server-wizard/trunk/fuentes
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • zero-server-wizard/trunk/fuentes/debian/changelog

    r8210 r8221  
     1zero-server-wizard (0.12.4) xenial; urgency=high
     2
     3  * Inverting check logic.Blank spaces first, then if password fields are equal
     4
     5 -- Hector Garcia Huerta <hectorgh@gmail.com>  Tue, 30 Oct 2018 10:03:17 +0100
     6
    17zero-server-wizard (0.12.3) xenial; urgency=high
    28
  • zero-server-wizard/trunk/fuentes/install-files/usr/share/zero-server-wizard/master.py

    r8210 r8221  
    127127        def password_changed(self,widget):
    128128               
    129                 if self.password_entry.get_text()!=self.password_entry1.get_text():
     129                if " " in self.password_entry.get_text():
     130                        self.pass_label.set_markup("<span fgcolor='red'>" + _("Password cannot have blank spaces") +"</span>")
     131                        self.apply_button.set_sensitive(False)
     132
     133                elif self.password_entry.get_text()!=self.password_entry1.get_text():
    130134                        self.pass_label.set_markup("<span fgcolor='red'>" + _("Passwords do not match") +"</span>")
    131135                        self.apply_button.set_sensitive(False)
    132                 elif " " in self.password_entry.get_text():
    133                         self.pass_label.set_markup("<span fgcolor='red'>" + _("netadmin password cannot have blank spaces") +"</span>")
    134                         self.apply_button.set_sensitive(False)
     136
    135137                else:
    136138                        self.pass_label.set_markup("")
  • zero-server-wizard/trunk/fuentes/install-files/usr/share/zero-server-wizard/rsrc/main.glade

    r5755 r8221  
    9999                                            <property name="visible">True</property>
    100100                                            <property name="can_focus">False</property>
     101                                            <property name="spacing">5</property>
    101102                                            <child>
    102103                                              <object class="GtkLabel" id="label5">
  • zero-server-wizard/trunk/fuentes/install-files/usr/share/zero-server-wizard/slave.py

    r8210 r8221  
    156156        def password_changed(self,widget):
    157157               
    158                 if self.password_entry.get_text()!=self.password_entry1.get_text():
     158                if " " in self.password_entry.get_text():
     159                        self.pass_label.set_markup("<span fgcolor='red'>" + _("Password cannot have blank spaces") +"</span>")
     160                        self.apply_button.set_sensitive(False)
     161
     162                elif self.password_entry.get_text()!=self.password_entry1.get_text():
    159163                        self.pass_label.set_markup("<span fgcolor='red'>" + _("Passwords do not match") +"</span>")
    160164                        self.apply_button.set_sensitive(False)
    161                 elif " " in self.password_entry.get_text():
    162                         self.pass_label.set_markup("<span fgcolor='red'>" + _("netadmin password cannot have blank spaces") +"</span>")
    163                         self.apply_button.set_sensitive(False)
     165                       
    164166                else:
    165167                        self.pass_label.set_markup("")
Note: See TracChangeset for help on using the changeset viewer.