Răsfoiți Sursa

Merge branch 'master' of https://github.com/unaio/una

AntonLV 3 ani în urmă
părinte
comite
e62612200c

+ 3 - 0
modules/base/groups/classes/BxBaseModGroupsFormsEntryHelper.php

@@ -164,6 +164,9 @@ class BxBaseModGroupsFormsEntryHelper extends BxBaseModProfileFormsEntryHelper
             $sUrl = 'page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $aContentInfo[$CNF['FIELD_ID']];
         }
         
+        if (bx_is_api())
+            return bx_api_get_block('redirect', ['uri' => '/' . BxDolPermalinks::getInstance()->permalink($sUrl), 'timeout' => 1000]);
+        
         bx_alert($this->_oModule->getName(), 'redirect_after_edit', 0, false, array(
             'content' => $aContentInfo,
             'override_result' => &$sUrl,

+ 6 - 0
modules/base/groups/classes/BxBaseModGroupsModule.php

@@ -1233,6 +1233,12 @@ class BxBaseModGroupsModule extends BxBaseModProfileModule
         $oGroupProfile = BxDolProfile::getInstanceByContentAndType($aEvent['object_id'], $this->getName());
         $a['content']['url'] = $oGroupProfile->getUrl();
         $a['content']['title'] = $oGroupProfile->getDisplayName();
+        
+        $oConnection = BxDolConnection::getObjectInstance($CNF['OBJECT_CONNECTIONS']);
+        if($oConnection)
+            $a['content']['members'] = $oConnection->getConnectedInitiatorsCount($oGroupProfile->id(), true);
+        
+        $a['content']['visibility'] = $aEvent['object_privacy_view'];
 
         if(isset($CNF['FIELD_PUBLISHED'])) {
             $aContentInfo = $this->_oDb->getContentInfoById($aEvent['object_id']);

+ 1 - 1
modules/base/profile/classes/BxBaseModProfileFormsEntryHelper.php

@@ -244,7 +244,7 @@ class BxBaseModProfileFormsEntryHelper extends BxBaseModGeneralFormsEntryHelper
             $oSession->unsetValue('custom-referrer');
         }
 
-        parent::redirectAfterAdd($aContentInfo, $sRedirectUrl);
+        return parent::redirectAfterAdd($aContentInfo, $sRedirectUrl);
     }
 }
 

+ 0 - 3
modules/boonex/events/classes/BxEventsModule.php

@@ -502,9 +502,6 @@ class BxEventsModule extends BxBaseModGroupsModule implements iBxDolCalendarServ
             ),
         ]);
 
-        $a['content']['title'] = '';
-        $a['content']['text'] = '';
-
         return $a;
     }