Merge branch 'master' of https://github.com/ems-project/EMSCoreBundle

Author: dameert

.babelrc

@@ -1,2 +1,2 @@
-{ "presets": [ "stage-3" ] }
+{ "presets": [ "env", "stage-3", "stage-2" ] }
 

Resources/views/user/add.html.twig

@@ -21,6 +21,10 @@
 	    	{% if form.circles is defined %}
 	    	    {{ form_row(form.circles) }}
 	    	{% endif %}
+	    	{{ form_row(form.allowedToConfigureWysiwyg) }}
+    		{% include "EMSCoreBundle:user:wysiwygOptions.html.twig" with {
+				form: form
+			} %}
 {# 	    	{{ form_row(form.expiresAt) }}#}
     	</div>
     	<div class="col-md-6">
@@ -34,3 +38,88 @@
 </div>
 <!-- /.box -->
 {% endblock fos_user_content %}
+
+{% block javascripts %}
+	<script type="text/javascript">
+	function formatRepo (repo) {
+	    if (repo.loading) return repo.text;
+
+	    var markup = "<div class='select2-result-repository clearfix'>" +
+	      repo.text + "</div>";
+	      
+		return markup;
+	}
+	
+	function formatRepoSelection (repo) {
+	    return repo.text;
+	}
+
+	
+	$(document).ready(function() {
+		
+		$(".objectpicker").each(function(index){
+			var environment = $( this ).data('environment'); 
+			var type = $( this ).data('type'); 
+			var dynamicLoading = $( this ).data('dynamic-loading'); 
+
+			var params = {
+			  	escapeMarkup: function (markup) { return markup; }, // let our custom formatter work
+			  	templateResult: formatRepo, // omitted for brevity, see the source of this page
+			  	templateSelection: formatRepoSelection // omitted for brevity, see the source of this page
+			};
+
+
+			if(dynamicLoading){
+			  	params.minimumInputLength = 1,
+				params.ajax = {
+					url: '{{ path("elasticsearch.api.search") }}',
+			    	dataType: 'json',
+			    	delay: 250,
+			    	data: function (params) {
+			      		return {
+				        q: params.term, // search term
+				        page: params.page,
+				        environment: environment,
+				        type: type
+				      };
+				    },
+					processResults: function (data, params) {
+						// parse the results into the format expected by Select2
+						// since we are using custom formatting functions we do not need to
+						// alter the remote JSON data, except to indicate that infinite
+						// scrolling can be used
+						params.page = params.page || 1;
+				
+				      	return {
+					        results: data.items,
+					        pagination: {
+					          more: (params.page * 30) < data.total_count
+					        }
+				      	};
+			    	},
+			    	cache: true
+			  	};
+			}
+			
+			$( this ).select2(params);
+	    });
+		
+		$('.datepicker').datepicker({
+			format: '{{ datepicker_format }}',
+			todayBtn: true,
+			todayHighlight: true,
+			weekStart: {{ datepicker_weekstart }},
+			daysOfWeekHighlighted: {{ datepicker_daysofweek_highlighted | json_encode }},
+			daysOfWeekDisabled: [],
+			multidate: false
+		});
+	});   
+    </script>
+	{% include 'EMSCoreBundle:app:menu.html.twig' with {
+		'item':  'user-index'
+	}%}
+
+	{% include "EMSCoreBundle:user:wysiwygOptionsJS.html.twig" with {
+		form: form
+	} %}
+{% endblock javascripts %}

Service/DataService.php

@@ -215,9 +215,6 @@ public function propagateDataToComputedField(FormInterface $form, array& $object
 			}
 			else {
 				try {
-//					$this->twig->addExtension($this->appTwig); 
-//	Bugfix because we are always getting the following error (we should not inject the service we load in the construct?):
-//	Error in template: Unable to register extension "app_extension" as extensions have already been initialized.
 					$out = $this->twig->createTemplate($template)->render([
 						'_source' => $objectArray,
 						'_type' => $type,

Service/PublishService.php

@@ -8,7 +8,6 @@
 use EMS\CoreBundle\Event\RevisionPublishEvent;
 use EMS\CoreBundle\Event\RevisionUnpublishEvent;
 use EMS\CoreBundle\Repository\RevisionRepository;
-use EMS\CoreBundle\Twig\AppExtension;
 use Doctrine\Bundle\DoctrineBundle\Registry;
 use Elasticsearch\Client;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -20,7 +19,6 @@
 class PublishService
 {
 
-	protected $twig;
 	/**@var Registry $doctrine */
 	protected $doctrine;
 	/**@var AuthorizationCheckerInterface $authorizationChecker*/