|
From: <gem...@li...> - 2012-09-18 17:14:21
|
Revision: 944
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=944&view=rev
Author: matijsdejong
Date: 2012-09-18 17:14:15 +0000 (Tue, 18 Sep 2012)
Log Message:
-----------
Fix in ModelFormSnippetAbstract.php where menu item was not found so reroute went to index, not show
Extra cache clean for new organizations
Modified Paths:
--------------
trunk/library/classes/Gems/Snippets/ModelFormSnippetAbstract.php
trunk/library/classes/Gems/User/User.php
Modified: trunk/library/classes/Gems/Snippets/ModelFormSnippetAbstract.php
===================================================================
--- trunk/library/classes/Gems/Snippets/ModelFormSnippetAbstract.php 2012-09-18 15:19:39 UTC (rev 943)
+++ trunk/library/classes/Gems/Snippets/ModelFormSnippetAbstract.php 2012-09-18 17:14:15 UTC (rev 944)
@@ -217,8 +217,12 @@
$this->afterSaveRouteUrl['controller'] = $this->request->getControllerName();
}
+ // Search array for menu item
+ $find['controller'] = $this->afterSaveRouteUrl['controller'];
+ $find['action'] = $this->afterSaveRouteUrl['action'];
+
// If not allowed, redirect to index
- if (null == $this->menu->find($this->afterSaveRouteUrl)) {
+ if (null == $this->menu->find($find)) {
$this->afterSaveRouteUrl['action'] = 'index';
$this->resetRoute = true;
}
Modified: trunk/library/classes/Gems/User/User.php
===================================================================
--- trunk/library/classes/Gems/User/User.php 2012-09-18 15:19:39 UTC (rev 943)
+++ trunk/library/classes/Gems/User/User.php 2012-09-18 17:14:15 UTC (rev 944)
@@ -1221,6 +1221,9 @@
$this->_setVar('__allowedOrgs', $orgs);
+ // Clean this cache
+ $this->_unsetVar('__allowedRespOrgs');
+
return $this;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|