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

Merge branch 'dev' into 'master' 

Corrige construcción de rutas a imagen

See merge request redmic-project/client/templates!25
parents 3f831ca0 12ed4174

package-lock.json

+2 −2
Original line number Diff line number Diff line 
{

  "name": "@redmic-project/templates",

  "version": "0.28.0",

  "version": "0.28.1",

  "lockfileVersion": 3,

  "requires": true,

  "packages": {

    "": {

      "name": "@redmic-project/templates",

      "version": "0.28.0",

      "version": "0.28.1",

      "hasInstallScript": true,

      "license": "Apache-2.0",

      "devDependencies": {

package.json

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

  "name": "@redmic-project/templates",

  "version": "0.28.0",

  "version": "0.28.1",

  "author": "REDMIC",

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

  "description": "Handlebars templates for REDMIC",

src/Helpers/customParser.js

+7 −7
Original line number Diff line number Diff line
@@ -245,24 +245,24 @@ define([ 


		Image: function(imagePath, useCredentials) {



			var imgSrc;

			let imgSrc;

			if (!imagePath) {

				imgSrc = '/res/images/noIMG.png';

			} else if (imagePath.indexOf('/') !== 0) {

				imgSrc = imagePath;

			} else {

				// TODO se reemplaza la terminación de la ruta al servidor porque las imágenes ya

				// la contienen. Cuando se corrija esta circunstancia, eliminar el reemplazo

				var imgSrcPrefix = redmicConfig.getEnvVariableValue('envApiUrl').replace('/api', '');

				imgSrc = imgSrcPrefix + imagePath;

				let imgSrcPrefix = redmicConfig.getEnvVariableValue('envApiUrl'),

					imgSrcSuffix = imagePath.replace('/api', '');



				var mustUseCredentials = useCredentials && typeof useCredentials === 'boolean';

				imgSrc = imgSrcPrefix + imgSrcSuffix;



				const mustUseCredentials = useCredentials && typeof useCredentials === 'boolean';

				if (mustUseCredentials && !Credentials.userIsGuest()) {

					imgSrc += '?access_token=' + Credentials.get('accessToken');

				}

			}



			var imgItem = '<img src="' + imgSrc + '"/><br>';

			const imgItem = '<img src="' + imgSrc + '"/><br>';



			return new handlebars.SafeString(imgItem);

		},