Menu
▾
▴
gemstracker-svn
|
From: <gem...@li...> - 2011-11-28 15:20:07
|
Revision: 300
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=300&view=rev
Author: michieltcs
Date: 2011-11-28 15:20:01 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
Use getCurrentURI() method
Modified Paths:
--------------
trunk/library/classes/Gems/Default/IndexAction.php
Modified: trunk/library/classes/Gems/Default/IndexAction.php
===================================================================
--- trunk/library/classes/Gems/Default/IndexAction.php 2011-11-28 15:16:40 UTC (rev 299)
+++ trunk/library/classes/Gems/Default/IndexAction.php 2011-11-28 15:20:01 UTC (rev 300)
@@ -300,7 +300,7 @@
// Allow layout switching based on request base url
if ($this->escort instanceof Gems_Project_Layout_MultiLayoutInterface) {
- $hostUrl = $request->getScheme() . '://' . $request->getHttpHost() . $request->getBasePath();
+ $hostUrl = $this->escort->loader->getUtil()->getCurrentURI();
$organizationId = $this->util->getDbLookup()->getOrganizationForUrl($hostUrl);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-12-05 12:45:05
|
Revision: 340
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=340&view=rev
Author: mennodekker
Date: 2011-12-05 12:44:59 +0000 (Mon, 05 Dec 2011)
Log Message:
-----------
Made number of visible options in organization element adjustable
Modified Paths:
--------------
trunk/library/classes/Gems/Default/IndexAction.php
Modified: trunk/library/classes/Gems/Default/IndexAction.php
===================================================================
--- trunk/library/classes/Gems/Default/IndexAction.php 2011-12-05 11:55:49 UTC (rev 339)
+++ trunk/library/classes/Gems/Default/IndexAction.php 2011-12-05 12:44:59 UTC (rev 340)
@@ -70,6 +70,15 @@
public $project;
/**
+ * For small numbers of organizations a multiline selectbox will be nice. This
+ * setting handles how many lines will display at once. Use 1 for the normal
+ * dropdown selectbox
+ *
+ * @var int
+ */
+ protected $organizationMaxLines = 6;
+
+ /**
* The default behaviour for showing a lost password button
*
* @var boolean
@@ -191,7 +200,9 @@
$element->setLabel($this->_('Organization'));
$element->setMultiOptions($orgs);
$element->setRequired(true);
- $element->setAttrib('size', max(count($orgs) + 1, 6));
+ if ($this->organizationMaxLines > 1) {
+ $element->setAttrib('size', max(count($orgs) + 1, $this->organizationMaxLines));
+ }
if (! $this->_request->isPost()) {
$element->setValue($org);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-12-05 12:56:11
|
Revision: 341
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=341&view=rev
Author: mennodekker
Date: 2011-12-05 12:56:05 +0000 (Mon, 05 Dec 2011)
Log Message:
-----------
Marked code that should be moved to a better place
Modified Paths:
--------------
trunk/library/classes/Gems/Default/IndexAction.php
Modified: trunk/library/classes/Gems/Default/IndexAction.php
===================================================================
--- trunk/library/classes/Gems/Default/IndexAction.php 2011-12-05 12:44:59 UTC (rev 340)
+++ trunk/library/classes/Gems/Default/IndexAction.php 2011-12-05 12:56:05 UTC (rev 341)
@@ -306,6 +306,12 @@
{
$request = $this->getRequest();
+ /**
+ * @@TODO: Start block to move to Gems_User_User->getCurrentOrganizationId()
+ *
+ * At that place the cookie is read, but this could be changed to use url like here
+ * or maybe referrer, ip-range, get-param etc.
+ */
// Allow layout switching based on request base url
if ($this->escort instanceof Gems_Project_Layout_MultiLayoutInterface) {
$hostUrl = $this->escort->loader->getUtil()->getCurrentURI();
@@ -320,6 +326,9 @@
$this->escort->layoutSwitch($request);
}
}
+ /**
+ * End block to move to Gems_User_User->getCurrentOrganizationId()
+ */
$form = $this->_getLoginForm();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-01-24 15:02:19
|
Revision: 421
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=421&view=rev
Author: mennodekker
Date: 2012-01-24 15:02:13 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------
Fix for orgId=0 on login with only one org
Modified Paths:
--------------
trunk/library/classes/Gems/Default/IndexAction.php
Modified: trunk/library/classes/Gems/Default/IndexAction.php
===================================================================
--- trunk/library/classes/Gems/Default/IndexAction.php 2012-01-24 14:23:03 UTC (rev 420)
+++ trunk/library/classes/Gems/Default/IndexAction.php 2012-01-24 15:02:13 UTC (rev 421)
@@ -190,6 +190,9 @@
$org = $this->loader->getCurrentUser()->getCurrentOrganizationId();
$orgs = $this->util->getDbLookup()->getOrganizationsForLogin();
$hidden = count($orgs) < 2;
+ if ($hidden) {
+ $org = array_shift(array_keys($orgs));
+ }
}
if ($hidden) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-04-02 17:55:53
|
Revision: 592
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=592&view=rev
Author: matijsdejong
Date: 2012-04-02 17:55:47 +0000 (Mon, 02 Apr 2012)
Log Message:
-----------
Strings switched
Modified Paths:
--------------
trunk/library/classes/Gems/Default/IndexAction.php
Modified: trunk/library/classes/Gems/Default/IndexAction.php
===================================================================
--- trunk/library/classes/Gems/Default/IndexAction.php 2012-04-02 17:52:30 UTC (rev 591)
+++ trunk/library/classes/Gems/Default/IndexAction.php 2012-04-02 17:55:47 UTC (rev 592)
@@ -139,7 +139,7 @@
protected function displayResetForm(Gems_User_Form_ResetForm $form, $errors)
{
if ($form->hasResetKey()) {
- $this->html->h3($this->_('Request password reset'));
+ $this->html->h3($this->_('Execute password reset'));
$p = $this->html->pInfo($this->_('We received your password reset request. '));
if ($form->getOrganizationIsVisible()) {
@@ -148,7 +148,7 @@
$p->append($this->_('Please enter the username or e-mail address belonging to this request.'));
}
} else {
- $this->html->h3($this->_('Execute password reset'));
+ $this->html->h3($this->_('Request password reset'));
$p = $this->html->pInfo();
if ($form->getOrganizationIsVisible()) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X