ソースを参照

cudzyslowia - TODO piotr czy to nie wykrzacza czegos.

a.binder 8 年 前
コミット
5c68dd0eff

+ 2 - 1
SE/schema/gui/core/default_db.in7_mk_baza_dystrybucji.php

@@ -14,10 +14,10 @@ class Schema__Core__default_db__in7_mk_baza_dystrybucji extends Schema_TableBase
 	  	 Osoba odp. {L_APPOITMENT_USER}, Notatka celu {L_APPOITMENT_INFO}, w term do:  {L_APPOITMENT_DATE},%0D%0A
 	  	 Osoba odp. {L_APPOITMENT_USER}, Notatka celu {L_APPOITMENT_INFO}, w term do:  {L_APPOITMENT_DATE},%0D%0A
 	  	 Inf o zadaniach {IN7_DZIENNIK_KORESP_INFO_trigger}%0D%0A
 	  	 Inf o zadaniach {IN7_DZIENNIK_KORESP_INFO_trigger}%0D%0A
 	  	 %0D%0A
 	  	 %0D%0A
-      
       %0D%0A
       %0D%0A
       %0D%0A
       %0D%0A
       Notatki poz {M_DIST_DESC_HTML} %0D%0A
       Notatki poz {M_DIST_DESC_HTML} %0D%0A
+      link do sprawy http://'.$_SERVER['HTTP_REFERER'].'/'.$_SERVER['SCRIPT_NAME'].'?_route=ViewTableAjax&namespace=default_db/IN7_MK_BAZA_DYSTRYBUCJI#EDIT/{ID} 
       %0D%0A
       %0D%0A
       ">@ </a> &nbsp; <a href="index.php?_route=ViewTableAjax&namespace=default_db/PROBLEMS&ff_ID_PROJECT={ID}">Zadania: {TASKS_INFO_trigger}</a><br><a href="index.php?_route=ViewTableAjax&namespace=default_db/IN7_DZIENNIK_KORESP&ff_ID_PROJECT={ID}">Pisma: {IN7_DZIENNIK_KORESP_INFO_trigger}</a>',
       ">@ </a> &nbsp; <a href="index.php?_route=ViewTableAjax&namespace=default_db/PROBLEMS&ff_ID_PROJECT={ID}">Zadania: {TASKS_INFO_trigger}</a><br><a href="index.php?_route=ViewTableAjax&namespace=default_db/IN7_DZIENNIK_KORESP&ff_ID_PROJECT={ID}">Pisma: {IN7_DZIENNIK_KORESP_INFO_trigger}</a>',
       'aliasMap' => [
       'aliasMap' => [
@@ -37,6 +37,7 @@ class Schema__Core__default_db__in7_mk_baza_dystrybucji extends Schema_TableBase
         'L_APPOITMENT_DATE' => 'L_APPOITMENT_DATE',
         'L_APPOITMENT_DATE' => 'L_APPOITMENT_DATE',
         'M_DIST_DESC_HTML' => 'M_DIST_DESC_HTML',
         'M_DIST_DESC_HTML' => 'M_DIST_DESC_HTML',
 		'TASKS_INFO_trigger' => 'TASKS_INFO_trigger',
 		'TASKS_INFO_trigger' => 'TASKS_INFO_trigger',
+		'ID' => 'ID',
         'P_ID' => 'P_ID'
         'P_ID' => 'P_ID'
       ]
       ]
     ]; // link do sprawy http://'.$_SERVER['HTTP_REFERER'].'/'.$_SERVER['SCRIPT_NAME'].'?_route=ViewTableAjax&amp;namespace=default_db/IN7_MK_BAZA_DYSTRYBUCJI#EDIT/{ID} %0D%0A  - nie dziala
     ]; // link do sprawy http://'.$_SERVER['HTTP_REFERER'].'/'.$_SERVER['SCRIPT_NAME'].'?_route=ViewTableAjax&amp;namespace=default_db/IN7_MK_BAZA_DYSTRYBUCJI#EDIT/{ID} %0D%0A  - nie dziala

+ 3 - 3
SE/se-lib/Core/AclSimpleSchemaBase.php

@@ -375,9 +375,9 @@ class Core_AclSimpleSchemaBase extends Core_AclBase {
           // });
           // });
           foreach ($this->getXsdFieldParam($fieldName, 'aliasMap') as $itemFieldName => $alias) {
           foreach ($this->getXsdFieldParam($fieldName, 'aliasMap') as $itemFieldName => $alias) {
             DBG::_('DBG_ACL', '>1', "aliasMap({$itemFieldName} => {$alias})", $item[$itemFieldName], __CLASS__, __FUNCTION__, __LINE__);
             DBG::_('DBG_ACL', '>1', "aliasMap({$itemFieldName} => {$alias})", $item[$itemFieldName], __CLASS__, __FUNCTION__, __LINE__);
-            if($itemFieldName=='LINK_PROBLEMS')
-            	$link = str_replace("{{$alias}}", $item[$itemFieldName],   str_replace($link,'"','test')   ); // bledy z cudzyslowami w <a href=\"mailto:?
-            else
+            //if($itemFieldName=='LINK_PROBLEMS')
+            //	$link = str_replace("{{$alias}}", $item[$itemFieldName],   str_replace($link,'"','test')   ); // bledy z cudzyslowami w <a href=\"mailto:?
+            //else //to nie tutaj - ciezko wysledzic
             $link = str_replace("{{$alias}}", $item[$itemFieldName],   $link  ); 
             $link = str_replace("{{$alias}}", $item[$itemFieldName],   $link  ); 
 
 
           }
           }

+ 2 - 1
SE/se-lib/TableAjax.php.TableAjax.js

@@ -485,7 +485,8 @@ var TableAjax = function() {
 							$.each(_fieldProps._tsSimpleLink.aliasMap, function(i, v) {
 							$.each(_fieldProps._tsSimpleLink.aliasMap, function(i, v) {
 								// console.log('simpleLink aliasMap fldName:', fldName, 'i:', i, 'v:', v, 'row['+v+']', row[v], 'val', val, 'typeof val', typeof val);
 								// console.log('simpleLink aliasMap fldName:', fldName, 'i:', i, 'v:', v, 'row['+v+']', row[v], 'val', val, 'typeof val', typeof val);
 								if (undefined !== row[v]) {
 								if (undefined !== row[v]) {
-									valLink = valLink.replace(new RegExp('\{' + i + '\}', 'g'), row[v]);
+									//valLink = valLink.replace(new RegExp('\{' + i + '\}', 'g'), row[v]);
+									 valLink = valLink.replace(new RegExp('\{' + i + '\}', 'g'),   row[v].replace('"','') ); //naprawa <a href="mailto:?subject=W spr. p
 								}
 								}
 							});
 							});
 						}
 						}