[gnue] r10265 - in trunk/gnue-forms: . src/GFObjects
[email protected] Fri, 3 Dec 2010 11:29:41 -0600 (CST)
| Newsgroups | gmane.comp.cms.gnue.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: reinhard Date: 2010-12-03 11:29:41 -0600 (Fri, 03 Dec 2010) New Revision: 10265 Modified: trunk/gnue-forms/ trunk/gnue-forms/src/GFObjects/GFBlock.py trunk/gnue-forms/src/GFObjects/GFField.py Log: Some improvements for the display of forms in query mode. Property changes on: trunk/gnue-forms ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2010-12-03 12:21:40.121000051 +0100 committer: Reinhard M=C3=BCller <[email protected]> properties:=20 branch-nick: forms + timestamp: 2010-12-03 12:54:17.599999905 +0100 committer: Reinhard M=C3=BCller <[email protected]> properties:=20 branch-nick: forms Name: bzr:file-ids - src/uidrivers/wx/widgets/entry.py 10053@3a364389-8fce-0310-8f11-cc36= 3fde16c7:trunk%2Fgnue-forms:src%2Fuidrivers%2Fwx%2Fwidgets%2Fentry.py + src/GFObjects/GFBlock.py 1459@3a364389-8fce-0310-8f11-cc363fde16c7:t= runk%2Fgnue-forms:src%2FGFObjects%2FGFBlock.py src/GFObjects/GFField.py 1459@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%= 2Fgnue-forms:src%2FGFObjects%2FGFField.py Name: bzr:revision-id:v4 - 3116 [email protected] 3117 [email protected] 3118 [email protected] 3119 [email protected] 3120 [email protected] 3121 [email protected] 3122 [email protected] 3123 [email protected] 3124 [email protected] 3125 [email protected] 3126 [email protected] 3127 [email protected] 3128 [email protected] 3129 [email protected] 3130 [email protected] 3131 [email protected] 3132 [email protected] 3133 [email protected] 3134 [email protected] 3135 [email protected] 3136 [email protected] 3137 [email protected] 3138 [email protected] 3139 [email protected] 3140 [email protected] 3141 [email protected] 3142 [email protected] 3143 [email protected] 3144 [email protected] 3145 [email protected] 3146 [email protected] 3147 [email protected] 3148 [email protected] 3149 [email protected] 3150 [email protected] 3151 [email protected] 3152 [email protected] 3153 [email protected] 3154 [email protected] 3155 [email protected] 3156 [email protected] 3157 [email protected] 3158 [email protected] 3159 [email protected] 3160 [email protected] 3161 [email protected] 3162 [email protected] 3163 [email protected] 3164 [email protected] 3165 [email protected] 3166 [email protected] 3167 [email protected] 3168 [email protected] 3169 [email protected] 3170 [email protected] 3171 [email protected] + 3116 [email protected] 3117 [email protected] 3118 [email protected] 3119 [email protected] 3120 [email protected] 3121 [email protected] 3122 [email protected] 3123 [email protected] 3124 [email protected] 3125 [email protected] 3126 [email protected] 3127 [email protected] 3128 [email protected] 3129 [email protected] 3130 [email protected] 3131 [email protected] 3132 [email protected] 3133 [email protected] 3134 [email protected] 3135 [email protected] 3136 [email protected] 3137 [email protected] 3138 [email protected] 3139 [email protected] 3140 [email protected] 3141 [email protected] 3142 [email protected] 3143 [email protected] 3144 [email protected] 3145 [email protected] 3146 [email protected] 3147 [email protected] 3148 [email protected] 3149 [email protected] 3150 [email protected] 3151 [email protected] 3152 [email protected] 3153 [email protected] 3154 [email protected] 3155 [email protected] 3156 [email protected] 3157 [email protected] 3158 [email protected] 3159 [email protected] 3160 [email protected] 3161 [email protected] 3162 [email protected] 3163 [email protected] 3164 [email protected] 3165 [email protected] 3166 [email protected] 3167 [email protected] 3168 [email protected] 3169 [email protected] 3170 [email protected] 3171 [email protected] 3172 [email protected] Name: bzr:text-parents - src/uidrivers/wx/widgets/entry.py [email protected]= 202202940-kv3x2nnl7ljp8ywo + src/GFObjects/GFBlock.py [email protected]= -eeesm6a88ihyja18 src/GFObjects/GFField.py [email protected]= 2nnl7ljp8ywo Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-forms/src/GFObjects/GFBlock.py 2010-12-03 17:29:37 UTC (re= v 10264) +++ trunk/gnue-forms/src/GFObjects/GFBlock.py 2010-12-03 17:29:41 UTC (re= v 10265) @@ -1140,8 +1140,8 @@ for the current record. """ =20 - if self.mode =3D=3D 'query' and self.queryable: - if record_number is None or record_number =3D=3D 0: + if self.mode =3D=3D 'query': + if self.queryable and record_number is None or record_number= =3D=3D 0: return self.__query_values.get(field) else: return None Modified: trunk/gnue-forms/src/GFObjects/GFField.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/gnue-forms/src/GFObjects/GFField.py 2010-12-03 17:29:37 UTC (re= v 10264) +++ trunk/gnue-forms/src/GFObjects/GFField.py 2010-12-03 17:29:41 UTC (re= v 10265) @@ -417,10 +417,13 @@ =20 db_value =3D self.__get_value(record_number) =20 - if self._block.mode =3D=3D 'query' and db_value =3D=3D chr(0): - return u_("(empty)") - elif self._block.mode =3D=3D 'query' and db_value is None: - return u_("(all)") + if self._block.mode =3D=3D 'query' and self._block.queryable: + if record_number not in (0, None): + return None + if db_value =3D=3D chr(0): + return u_("(empty)") + if db_value is None: + return u_("(all)") =20 if self.__lookup_dict is None: return None @@ -437,7 +440,7 @@ return None else: # db returned value that is actually not allowed - return u"(invalid)" + return u_(u"(invalid)") =20 # ------------------------------------------------------------------= ------- =20 @@ -771,9 +774,13 @@ def __refresh_ui_choices(self): =20 if self._block.mode =3D=3D 'query': - lookup =3D [u_("(all)"), u_("(empty)")] + self.__lookup_list - if '' in lookup: - lookup.remove('') + if self._block.queryable: + lookup =3D [u_("(all)"), u_("(empty)")] + self.__lookup_= list + if "" in lookup: + lookup.remove("") + else: + # Set to empty list so listboxes are shown empty. + lookup =3D [] else: lookup =3D self.__lookup_list =20