From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Mon, 5 Jan 2015 16:43:29 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.3~126^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6f3b594f6003a388a3a746e9aac32107d2567fb6;hp=c17a3781bf8284cf85fcb0264003cbea51aebf6c;p=myslice.git

Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
---

diff --git a/portal/templates/fed4fire/fed4fire_slicerequest_view.html b/portal/templates/fed4fire/fed4fire_slicerequest_view.html
index 211f35da..98097dbb 100644
--- a/portal/templates/fed4fire/fed4fire_slicerequest_view.html
+++ b/portal/templates/fed4fire/fed4fire_slicerequest_view.html
@@ -63,10 +63,10 @@
 <script>
 jQuery(document).ready(function(){
 	
-	/*$("#authority_hrn").load("/rest/user/", {"fields" : ["parent_authority"], "filters": {"user_hrn": "{{ user_hrn }}"}}, function(data) {
+	$("#authority_hrn").load("/rest/user/", {"fields" : ["parent_authority"], "filters": {"user_hrn": "{{ user_hrn }}"}}, function(data) {
 		var jsonData = JSON.parse(data);
         $(this).attr("value", jsonData[0]['parent_authority']);
-    });*/
+    });
 	$("#authority_hrn").val("{{authority_name}}");
 	var availableTags = [
     {% if authorities %}
@@ -74,8 +74,8 @@ jQuery(document).ready(function(){
             {% if authority.name %}
                 {value:"{{ authority.name }}",label:"{{authority.name}}"},
 			// to show only full name
-           // {% else %}
-           //     {value:"{{ authority.authority_hrn }}",label:"{{authority.authority_hrn}}"},
+            {% else %}
+                {value:"{{ authority.authority_hrn }}",label:"{{authority.authority_hrn}}"},
             {% endif %}
         {% endfor %}    
     {% else %}