Commit 418d961d authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into feature-AtlasServiceUpgrade

parents 802a1405 0ff1be3a

package.json

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

  "name": "REDMIC",

  "version": "0.17.0",

  "version": "0.18.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/app/components/viewCustomization/parameter/views/templates/FTForm.html

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ 
		<div data-redmic-type="filter" data-redmic-model="dataDefinition/contactRole" data-redmic-props="

			propertyNameDependence: 'dataDefinition/contact',

			dependenceType: 'hidden',

			terms: {'ids':'6,7'},

			requiredWithDependence: true

		"></div>

	</form>

public/javascript/app/components/viewCustomization/parameter/views/templates/OCForm.html

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ 
		<div data-redmic-type="filter" data-redmic-model="dataDefinition/contactRole" data-redmic-props="

			propertyNameDependence: 'dataDefinition/contact',

			dependenceType: 'hidden',

			terms: {'ids':'6,7'},

			requiredWithDependence: true

		"></div>

	</form>

public/javascript/app/designs/edition/Controller.js

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ define([ 


			var item = response.data;



			if (this.getOwnChannel().indexOf("/add/") > -1) {

			if (this.getOwnChannel().indexOf('add/') !== -1) {

				this._cleanNotDesiredProps(item);

			}

public/javascript/app/edition/views/ActivityEditionView.js

+3 −1
Original line number Diff line number Diff line
@@ -40,7 +40,9 @@ define([ 


			this.config = {

				target: redmicConfig.services.activity,

				propsToClean: ["code", "id"]

				propsToClean: [

					'code', 'id', 'contacts.{i}.id', 'organisations.{i}.id', 'documents.{i}.id', 'platforms.{i}.id'

				]

			};



			lang.mixin(this, this.config, args);