Zrobienie aby edycja wskaznika w procesach przechodzila do edycji w systemowym oknie, zamiast starego menu edycji wskaznikow.

SE/procesy/proces.php

@@ -197,21 +197,19 @@ echo'<div id="tree"></div>';
 		$tree->set_param('filtr_img', ($tree_procesy_filter->get_arg('filtr_img') == '+'));
 		$tree->set_param('style', $tree_procesy_filter->get_arg('filtr_view'));
 		$tree->set_param('search_id', $tree_procesy_filter->get_arg('filtr_search_id'));
-		$tree->set_param('ProcesTblId', ProcesHelper::getZasobTableID('CRM_PROCES'));
-		$tree->set_param('ZasobTblId', ProcesHelper::getZasobTableID('CRM_LISTA_ZASOBOW'));
-
-		$tblPytaniaId = ProcesHelper::getZasobTableID('CRM_TESTY_PYTANIA');
-		if ($tblPytaniaId > 0) {
+		$tree->set_param('getZasobTableID', ProcesHelper::getZasobTableID('CRM_PROCES'));
+		$tree->set_param('getZasobTableID_CRM_LISTA_ZASOBOW', ProcesHelper::getZasobTableID('CRM_LISTA_ZASOBOW'));
+		$tree->set_param('getZasobTableID_CRM_WSKAZNIK', ProcesHelper::getZasobTableID('CRM_WSKAZNIK'));
 			$userAcl = User::getAcl();
-			$userAcl->fetchGroups();
-			if ($userAcl->hasTableAcl($tblPytaniaId)) {
-				$tblAcl = $userAcl->getTableAcl($tblPytaniaId);
-				$tblAcl->init($forceTblAclInit = false);
-				$tree->set_param('HasAclPytaniaTbl', true);
-			}
-			$tree->set_param('PytaniaTblId', $tblPytaniaId);
-		}
+		if($userAcl) {
+			$tblAcl = $userAcl->getTableAcl(ProcesHelper::getZasobTableID('CRM_PROCES'));
+			if($tblAcl)
+				if($tblAcl->hasFieldPerm($tblAcl->getFieldIdByName('ID'),'R')) $tree->set_param('hasFieldPerm__ID',1);
+		    $tblAcl = $userAcl->getTableAcl(ProcesHelper::getZasobTableID('CRM_WSKAZNIK'));
+			if($tblAcl)
+				if($tblAcl->hasFieldPerm($tblAcl->getFieldIdByName('ID'),'R')) $tree->set_param('hasFieldPerm__CRM_WSKAZNIK__ID',1);
 
+		}
 		//TODO: check perm to edit
 
 

SE/procesy5.php

@@ -2421,6 +2421,10 @@ function tree_callback__show_item_from_CRM_PROCES( &$r, &$tree ) {
 				echo App::link("v", array('function_init'=>'SORT_PRIO_WSKAZNIK', 'arg1'=> $w->CW_ID, 'arg1_val'=>'dw','_hash'=>rand(0,9999),'#'=>'TREE'.$r->ID), array('class'=>"btn-clean", 'title'=>"w dol"));
 				echo App::link("V", array('function_init'=>'SORT_PRIO_WSKAZNIK', 'arg1'=> $w->CW_ID, 'arg1_val'=>'downdown','_hash'=>rand(0,9999),'#'=>'TREE'.$r->ID), array('class'=>"btn-clean", 'title'=>"w dol o 5 pol"));
 				echo' ';
+				
+				if($tree->get_param('hasFieldPerm__CRM_WSKAZNIK__ID'))
+					echo App::link("E", "index.php?MENU_INIT=VIEWTABLE_AJAX&ZASOB_ID=".$tree->get_param('getZasobTableID_CRM_WSKAZNIK')."#EDIT/".$w->CW_ID, array('title'=>'Pliki', 'class'=>'btn-p5'));
+				else 
 				echo App::link("E", "?task=CRM_EDIT_CRM_WSKAZNIK&EDIT=".$w->CW_ID."&ID=".$w->CW_ID, array('title'=>'Edytuj', 'class'=>'btn-p5'));
 
 				if ($tree->get_param('ZasobTblId') > 0) {

SE/se-lib/Core/Database.php

@@ -10,6 +10,7 @@ class Core_Database {
 		$this->_conn = null;
 		$this->_errors = array();
 		$this->_database_name = $database;
+		if(!empty($params['zasob_id'])) $this->_zasob_id=$params['zasob_id'];
 	}
 
 	public function getDatabaseName() {