merge master
This commit is contained in:
		
				commit
				
					
						275ea47e41
					
				
			
		
					 32 changed files with 530 additions and 125 deletions
				
			
		| 
						 | 
				
			
			@ -9,6 +9,8 @@ from djangocms_text_ckeditor.fields import HTMLField
 | 
			
		|||
from filer.fields.file import FilerFileField
 | 
			
		||||
from filer.fields.image import FilerImageField
 | 
			
		||||
 | 
			
		||||
from datacenterlight.models import VMPricing
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class CMSIntegration(models.Model):
 | 
			
		||||
    name = models.CharField(
 | 
			
		||||
| 
						 | 
				
			
			@ -284,3 +286,12 @@ class DCLSectionPromoPluginModel(CMSPlugin):
 | 
			
		|||
        if self.background_image:
 | 
			
		||||
            extra_classes += ' promo-with-bg'
 | 
			
		||||
        return extra_classes
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class DCLCustomPricingModel(CMSPlugin):
 | 
			
		||||
    pricing = models.ForeignKey(
 | 
			
		||||
        VMPricing,
 | 
			
		||||
        related_name="dcl_custom_pricing_vm_pricing",
 | 
			
		||||
        help_text='Choose a pricing that will be associated with this '
 | 
			
		||||
                  'Calculator'
 | 
			
		||||
    )
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue