From 052d211cbc5c0ac6871c7af0c1c1b06bb952f680 Mon Sep 17 00:00:00 2001
From: saurabh <saurabh6790@gmail.com>
Date: Fri, 4 Sep 2015 14:33:43 +0530
Subject: [PATCH] File URL naming fixes

---
 frappe/core/doctype/file/file_list.js | 8 +++-----
 frappe/public/js/frappe/upload.js     | 1 -
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/frappe/core/doctype/file/file_list.js b/frappe/core/doctype/file/file_list.js
index d53f0b59b5..d424bb43d9 100644
--- a/frappe/core/doctype/file/file_list.js
+++ b/frappe/core/doctype/file/file_list.js
@@ -3,7 +3,7 @@ frappe.provide("frappe.ui");
 frappe.listview_settings['File'] = {
 	hide_name_column: true,
 	use_route: true,
-	add_fields: ["is_folder", "file_name"],
+	add_fields: ["is_folder", "file_name", "file_url"],
 	formatters: {
 		file_size: function(value) {
 			// formatter for file size
@@ -22,7 +22,7 @@ frappe.listview_settings['File'] = {
 		} else if(frappe.utils.is_image_file(data.file_name)) {
 			data._title = '<i class="icon-picture icon-fixed-width"></i> ' + data.file_name;
 		} else {
-			data._title = '<i class="icon-file-alt icon-fixed-width"></i> ' + data.file_name;
+			data._title = '<i class="icon-file-alt icon-fixed-width"></i> ' + (data.file_name ? data.file_name : data.file_url);
 		}
 	},
 	onload: function(doclist) {
@@ -90,9 +90,7 @@ frappe.listview_settings['File'] = {
 	set_primary_action:function(doclist){
 
 		doclist.page.clear_primary_action();
-		doclist.page.set_primary_action(__("New File"), function() {
-
-
+		doclist.page.set_primary_action(__("New"), function() {
 			dialog = frappe.ui.get_upload_dialog({
 				"data":{"folder": doclist.current_folder, "from_form": 1}
 			})
diff --git a/frappe/public/js/frappe/upload.js b/frappe/public/js/frappe/upload.js
index 50ec5b15be..97d115deff 100644
--- a/frappe/public/js/frappe/upload.js
+++ b/frappe/public/js/frappe/upload.js
@@ -71,7 +71,6 @@ frappe.upload = {
 			}
 			return;
 		}
-		console.log(args)
 
 		var dataurl = null;
 		var _upload_file = function() {