Index: branches/unlabeled/unlabeled-1.8.26/core/units/selectors/selectors_event_handler.php
===================================================================
diff -u -N -r3107 -r5725
--- branches/unlabeled/unlabeled-1.8.26/core/units/selectors/selectors_event_handler.php	(.../selectors_event_handler.php)	(revision 3107)
+++ branches/unlabeled/unlabeled-1.8.26/core/units/selectors/selectors_event_handler.php	(.../selectors_event_handler.php)	(revision 5725)
@@ -5,6 +5,22 @@
 
 	class SelectorsEventHandler extends InpDBEventHandler 
 	{
+		/**
+		 * Allows to override standart permission mapping
+		 *
+		 */
+		function mapPermissions()
+		{
+			parent::mapPermissions();
+			$permissions = Array(
+									'OnResetToBase'		=>	Array('subitem' => 'add|edit'),
+									'OnMassResetToBase'	=>	Array('subitem' => 'add|edit'),
+									
+									'OnOpenStyleEditor'	=>	Array('subitem' => 'add|edit'),
+									'OnSaveStyle'		=>	Array('subitem' => 'add|edit'),
+							);
+			$this->permMapping = array_merge($this->permMapping, $permissions);
+		}
 		
 		/**
 		 * Occures before an item has been cloned
@@ -142,8 +158,7 @@
 		 */
 		function SaveChanges(&$event)
 		{
-			$this->Application->setUnitOption($event->Prefix,'AutoLoad',false);
-			$object =& $event->getObject();
+			$object =& $event->getObject( Array('skip_autoload' => true) );
 			
 			$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
 			if($items_info)
@@ -180,9 +195,7 @@
 			$object =& $event->getObject();
 			$this->Application->SetVar($event->getPrefixSpecial().'_id', $object->GetId() );
 			
-			$return_tpl = $object->GetDBField('Type') == 1 ? 'base_style_edit' : 'block_style_edit';
-			
-			$this->finalizePopup($event, 'selectors.base','stylesheets/'.$return_tpl);
+			$this->finalizePopup($event);
 		}
 		
 		/**
@@ -338,8 +351,7 @@
 		 */
 		function OnMassResetToBase(&$event)
 		{
-			$this->Application->setUnitOption($event->Prefix,'AutoLoad',false);
-			$object =& $event->getObject();
+			$object =& $event->getObject( Array('skip_autoload' => true) );
 			
 			$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
 			if($items_info)