Merge branch 'FER_6265' into amdadev

Benjamin Renard
2 parents 073d0df3 4ac88d61
Showing 3 changed files with 8 additions and 3 deletions Show diff stats
js/app/views/AstroImagesUI.js
js/resources/css/amda.css
php/classes/AmdaAction.php
@@ -80,7 +80,7 @@ Ext.define(&#39;amdaUI.AstroImagesUI&#39;, {
 								{
 									var imageSrc = this.getPreviewUrl(image);
 									image.set('icon',imageSrc);
-									image.set('iconCls','x-tree-icon-leaf');
+									image.set('iconCls','amda-astro-tree-icon-leaf');
 								}
 								else
 								{
@@ -105,8 +105,6 @@ Ext.define(&#39;amdaUI.AstroImagesUI&#39;, {
 				if(image.get('checked'))
 				{
 					var name = image.get('name');
-					if (!name.substr(name.lastIndexOf('.') + 1) != "fits")
-						name+='.fits';
 					imgList.push({name:name, 
 								  url:me.getImageToSendUrl(image)});
 				}
@@ -638,4 +638,9 @@ p + p {
 .cm-s-default .cm-amda {
     color: rgb(9, 134, 218);
     font-weight: bold;
+}
+
+.amda-astro-tree-icon-leaf {
+    background-image: url(images/tree/leaf.gif);
+    background-size: contain;
 }
 \ No newline at end of file
@@ -1076,6 +1076,8 @@ class AmdaAction
 		// just convert TT / Catalog
 		if ($obj->nodeType == "download" &&  $obj->downloadSrc == "1")
 			return $this->executeRequest($obj, FunctionTypeEnumClass::TTCONVERT);
+		else if ($obj->nodeType == "download" &&  $obj->downloadSrc == "2")
+			return $this->executeRequest($obj, FunctionTypeEnumClass::DLOBJECT);
 		else if (isset($obj->action))
 			return $this->executeRequest($obj, FunctionTypeEnumClass::ACTION);
 		else