Просмотр исходного кода

Ticket #255 - Clean up: Create a profile.

AntonLV 10 лет назад
Родитель
Сommit
c969820cf2

+ 6 - 0
inc/classes/BxDolInformer.php

@@ -35,6 +35,7 @@ define('BX_INFORMER_ERROR', 3);
  */
 class BxDolInformer extends BxDol
 {
+	protected $_bEnabled = true;
     protected $_aMessages = array();
 
     /**
@@ -71,6 +72,11 @@ class BxDolInformer extends BxDol
         return ($GLOBALS['bxDolClasses']['BxDolInformer'] = $o);
     }
 
+    public function setEnabled($bEnabled)
+    {
+    	$this->_bEnabled = $bEnabled;
+    }
+
     /**
      * Add message to informer.
      * @param $sId - message id

+ 1 - 1
install/sql/system.sql

@@ -247,7 +247,7 @@ INSERT INTO `sys_options`(`category_id`, `name`, `caption`, `value`, `type`, `ex
 
 (@iCategoryId, 'sys_email_confirmation', '', 'on', 'checkbox', '', '', '', 40),
 
-(@iCategoryId, 'sys_redirect_after_account_added', '', 'page.php?i=create-persons-profile', 'digit', '', '', '', 50),
+(@iCategoryId, 'sys_redirect_after_account_added', '', 'page.php?i=account-profile-switcher', 'digit', '', '', '', 50),
 
 (@iCategoryId, 'sys_editor_default', '', 'sys_tinymce', 'digit', '', '', '', 60),
 (@iCategoryId, 'sys_captcha_default', '', 'sys_recaptcha', 'digit', '', '', '', 61),

+ 3 - 0
template/scripts/BxBaseInformer.php

@@ -38,6 +38,9 @@ class BxBaseInformer extends BxDolInformer
      */
     public function display ()
     {
+    	if(!$this->_bEnabled)
+    		return '';
+
         $this->_addPermanentMessages();
 
         if (!$this->_aMessages)

+ 3 - 2
template/scripts/BxBaseServiceProfiles.php

@@ -145,6 +145,9 @@ class BxBaseServiceProfiles extends BxDol
 
     public function serviceAccountProfileSwitcher ($iAccountId = false, $iActiveProfileId = null, $sUrlProfileAction = '')
     {
+    	$oTemplate = BxDolTemplate::getInstance();
+    	BxDolInformer::getInstance($oTemplate)->setEnabled(false);
+
         $oProfilesQuery = BxDolProfileQuery::getInstance();
 
         $aProfiles = $oProfilesQuery->getProfilesByAccount($iAccountId ? $iAccountId : getLoggedId());
@@ -182,9 +185,7 @@ class BxBaseServiceProfiles extends BxDol
             );
         }
 
-        $oTemplate = BxDolTemplate::getInstance();
         $oTemplate->addCss('account.css');
-
         return array(
             'content' => $oTemplate->parseHtmlByName('profile_switch_row.html', $aVars),
             'menu' => 'sys_add_profile',