auto-increment order value in privacy list entries. Fixes #5441
This commit is contained in:
		
							parent
							
								
									eb11c24eea
								
							
						
					
					
						commit
						e3dbbed2dd
					
				
					 1 changed files with 7 additions and 1 deletions
				
			
		|  | @ -3080,6 +3080,8 @@ class PrivacyListWindow: | ||||||
| 		self.global_rules = {} | 		self.global_rules = {} | ||||||
| 		self.list_of_groups = {} | 		self.list_of_groups = {} | ||||||
| 
 | 
 | ||||||
|  | 		self.max_order = 0 | ||||||
|  | 
 | ||||||
| 		# Default Edit Values | 		# Default Edit Values | ||||||
| 		self.edit_rule_type = 'jid' | 		self.edit_rule_type = 'jid' | ||||||
| 		self.allow_deny = 'allow' | 		self.allow_deny = 'allow' | ||||||
|  | @ -3175,6 +3177,8 @@ class PrivacyListWindow: | ||||||
| 			else: | 			else: | ||||||
| 				text_item = _('Order: %(order)s, action: %(action)s') % \ | 				text_item = _('Order: %(order)s, action: %(action)s') % \ | ||||||
| 					{'order': rule['order'], 'action': rule['action']} | 					{'order': rule['order'], 'action': rule['action']} | ||||||
|  | 			if int(rule['order']) > self.max_order: | ||||||
|  | 				self.max_order = int(rule['order']) | ||||||
| 			self.global_rules[text_item] = rule | 			self.global_rules[text_item] = rule | ||||||
| 			self.list_of_rules_combobox.append_text(text_item) | 			self.list_of_rules_combobox.append_text(text_item) | ||||||
| 		if len(rules) == 0: | 		if len(rules) == 0: | ||||||
|  | @ -3322,7 +3326,7 @@ class PrivacyListWindow: | ||||||
| 		self.edit_view_status_checkbutton.set_active(False) | 		self.edit_view_status_checkbutton.set_active(False) | ||||||
| 		self.edit_send_status_checkbutton.set_active(False) | 		self.edit_send_status_checkbutton.set_active(False) | ||||||
| 		self.edit_all_checkbutton.set_active(False) | 		self.edit_all_checkbutton.set_active(False) | ||||||
| 		self.edit_order_spinbutton.set_value(1) | 		self.edit_order_spinbutton.set_value(self.max_order + 1) | ||||||
| 		self.edit_type_group_combobox.set_active(0) | 		self.edit_type_group_combobox.set_active(0) | ||||||
| 		self.edit_type_subscription_combobox.set_active(0) | 		self.edit_type_subscription_combobox.set_active(0) | ||||||
| 		self.add_edit_rule_label.set_label( | 		self.add_edit_rule_label.set_label( | ||||||
|  | @ -3365,6 +3369,8 @@ class PrivacyListWindow: | ||||||
| 	def on_save_rule_button_clicked(self, widget): | 	def on_save_rule_button_clicked(self, widget): | ||||||
| 		tags=[] | 		tags=[] | ||||||
| 		current_tags = self.get_current_tags() | 		current_tags = self.get_current_tags() | ||||||
|  | 		if int(current_tags['order']) > self.max_order: | ||||||
|  | 			self.max_order = int(current_tags['order']) | ||||||
| 		if self.active_rule == '': | 		if self.active_rule == '': | ||||||
| 			tags.append(current_tags) | 			tags.append(current_tags) | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		
		Reference in a new issue