mirror of
				https://gitlab.com/Chill-Projet/chill-bundles.git
				synced 2025-11-04 03:08:25 +00:00 
			
		
		
		
	Compare commits
	
		
			4 Commits
		
	
	
		
			2.14.0
			...
			226-upgrad
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						
						
							
						
						b19a1ba53b
	
				 | 
					
					
						|||
| 3d4c439be4 | |||
| 
						
						
							
						
						4727a57825
	
				 | 
					
					
						|||
| 
						
						
							
						
						5f441eb5ac
	
				 | 
					
					
						
							
								
								
									
										5
									
								
								.changes/unreleased/Fixed-20231127-210138.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										5
									
								
								.changes/unreleased/Fixed-20231127-210138.yaml
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,5 @@
 | 
			
		||||
kind: Fixed
 | 
			
		||||
body: 'Export: fix list person with custom fields'
 | 
			
		||||
time: 2023-11-27T21:01:38.260730706+01:00
 | 
			
		||||
custom:
 | 
			
		||||
  Issue: ""
 | 
			
		||||
@@ -15,7 +15,7 @@
 | 
			
		||||
    "@symfony/webpack-encore": "^4.1.0",
 | 
			
		||||
    "@tsconfig/node14": "^1.0.1",
 | 
			
		||||
    "bindings": "^1.5.0",
 | 
			
		||||
    "bootstrap": "^5.0.1",
 | 
			
		||||
    "bootstrap": "^5.3.0",
 | 
			
		||||
    "chokidar": "^3.5.1",
 | 
			
		||||
    "fork-awesome": "^1.1.7",
 | 
			
		||||
    "jquery": "^3.6.0",
 | 
			
		||||
 
 | 
			
		||||
@@ -280,7 +280,7 @@ class CustomFieldChoice extends AbstractCustomField
 | 
			
		||||
        $template = '@ChillCustomFields/CustomFieldsRendering/choice.html.twig';
 | 
			
		||||
 | 
			
		||||
        if ('csv' === $documentType) {
 | 
			
		||||
            $template = 'ChillCustomFieldsBundle/CustomFieldsRendering/choice.csv.twig';
 | 
			
		||||
            $template = '@ChillCustomFields/CustomFieldsRendering/choice.csv.twig';
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        return $this->templating
 | 
			
		||||
 
 | 
			
		||||
@@ -11,6 +11,7 @@
 | 
			
		||||
 | 
			
		||||
// 3. Include remainder of required Bootstrap stylesheets
 | 
			
		||||
@import "bootstrap/scss/variables";
 | 
			
		||||
@import "bootstrap/scss/variables-dark";
 | 
			
		||||
 | 
			
		||||
// 4. Include any default map overrides here
 | 
			
		||||
@import "custom/_maps";
 | 
			
		||||
 
 | 
			
		||||
@@ -332,13 +332,18 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
 | 
			
		||||
                if (null === $value) {
 | 
			
		||||
                    return '';
 | 
			
		||||
                }
 | 
			
		||||
                $decoded = json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR);
 | 
			
		||||
 | 
			
		||||
                if ('_header' === $value) {
 | 
			
		||||
                    $label = $cfType->getChoices($cf)[$slugChoice];
 | 
			
		||||
 | 
			
		||||
                    return $this->translatableStringHelper->localize($cf->getName())
 | 
			
		||||
                            .' | '.$label;
 | 
			
		||||
                        .' | '.$label;
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                try {
 | 
			
		||||
                    $decoded = json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR);
 | 
			
		||||
                } catch (\JsonException $e) {
 | 
			
		||||
                    throw new \RuntimeException(sprintf('unable to decode json: %s, %s', json_last_error(), json_last_error_msg()), $e->getCode(), $e);
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                if ('_other' === $slugChoice && $cfType->isChecked($cf, $slugChoice, $decoded)) {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user