Commit aadd62d1 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'hotfix-copyActivityMeasurements' into 'master' 

Hotfix copy activity measurements

See merge request redmic-project/client/web!33
parents ff3de89f bbc7f31a

package.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "REDMIC",

  "version": "0.14.0",

  "version": "0.14.1",

  "author": "REDMIC",

  "homepage": "https://gitlab.com/redmic-project/client/web/blob/master/README.md",

  "description": "Integrated marine data repository of Canary Islands - Client",

public/javascript/redmic/modules/layout/wizard/Wizard.js

+6 −4
Original line number Diff line number Diff line
@@ -318,12 +318,14 @@ define([ 


			var data = req.data;



			if (data && data.id) {

			if (data) {

				if (data.id) {

					this._editing = true;



					if (!this.noTitle) {

						this._setTitle(this.editionTitle, data);

					}

				}



				this._instanceDataToResults(data);

			}