Commit 28bb227d authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'feature-fixFileUploadAndCopyMeasurements' into 'dev' 

Feature fix file upload and copy measurements

See merge request redmic-project/client/web!40
parents 421c454d 120d5812

public/javascript/app/components/Router.js

+3 −4
Original line number Diff line number Diff line
@@ -276,10 +276,9 @@ define([ 


			var locationObj = getGlobalContext().location,

				locationPath = locationObj.pathname,

				moduleUrl = locationPath.substr(1),

				urlSplitted = moduleUrl.split('?'),

				route = urlSplitted[0],

				query = urlSplitted[1],

				locationQuery = locationObj.search,

				route = locationPath.substr(1),

				query = locationQuery.substr(1),

				routeIsEmpty = !route || route === '' || route === this.paths.ROOT,

				loginWasSuccessful = route === this.paths.LOGIN && this._userFound;

public/javascript/app/nls/es/translation.js

+2 −0
Original line number Diff line number Diff line
@@ -1166,6 +1166,8 @@ define({ 


	, "followUs": "Síguenos"



	, "load": "Cargar"



	// Para capas que no se pueden cambiar las keys

	, "descript_1": "Descripción"

	, "descriptio": "Descripción"

public/javascript/app/nls/translation.js

+2 −0
Original line number Diff line number Diff line
@@ -1171,6 +1171,8 @@ define({ 


		, "followUs": "Follow us"



		, "load": "Load"



		//Para capas que no se pueden cambiar las keys

		, "descript_1": "Description"

		, "descriptio": "Description"

public/javascript/redmic/form/UploadInput.js

+13 −3
Original line number Diff line number Diff line 
define([

	'alertify/alertify.min'

	, 'app/redmicConfig'

	, 'dijit/_TemplatedMixin'

	, 'dijit/_WidgetBase'

	, 'dojo/_base/declare'
@@ -13,6 +14,7 @@ define([ 
	, 'dropzone/dropzone.min'

], function(

	alertify

	, redmicConfig

	, _TemplatedMixin

	, _WidgetBase

	, declare
@@ -68,14 +70,22 @@ define([ 


		postCreate: function() {



			if (!this.url) {

			var envDfd = window.env;



			if (!this.url || !envDfd) {

				console.error('URL not specified for file upload input');

				return;

			}



			this._setPreviousProperties();



			envDfd.then(lang.hitch(this, function(envData) {



				this.url = redmicConfig.getServiceUrl(this.url, envData);



				this._dropzone = this._getNewInstance();

				this._listenInstanceEvents(this._dropzone);

			}));

		},



		_setPreviousProperties: function() {