Commits

Jason Green committed e0183f4 Merge

Merge with default

Comments (0)

Files changed (12)

app/protected/modules/accounts/tests/functional/AccountsTestSuite.html

 <tr><td><a href="cases/Create.html">Create Edit Account</a></td></tr>
 <tr><td><a href="cases/Search.html">Search Account</a></td></tr>
 <tr><td><a href="cases/AdvancedSearchAccount.html">AdvancedSearchAccount</a></td></tr>
-<tr><td><a href="cases/ListViewHideShowColumns.html">ListViewHideShowColumns</a></td></tr>
 <tr><td><a href="cases/MassEdit.html">Mass Edit Walk through</a></td></tr>
 <tr><td><a href="cases/OwnerTypeAhead.html">Auto Complete Owner search</a></td></tr>
 <tr><td><a href="cases/Delete.html">Delete Account</a></td></tr>
+<tr><td><a href="cases/ListViewHideShowColumns.html">ListViewHideShowColumns</a></td></tr>
 </tbody></table>
 </body>
 </html>

app/protected/modules/accounts/tests/functional/cases/AdvancedSearchAccount.html

 <thead>
 <tr><td rowspan="1" colspan="3">Advanced Search Account</td></tr>
 </thead><tbody>
+<tr> 
+    <td>setTimeout</td> 
+    <td>45000</td> 
+    <td></td> 
+</tr>
 <tr>
 	<td>setSpeed</td>
 	<td>1000</td>

app/protected/modules/accounts/tests/functional/cases/Create.html

 <tr><td rowspan="1" colspan="3">Create Account</td></tr>
 </thead>
 <tbody>
+<tr> 
+    <td>setTimeout</td> 
+    <td>45000</td> 
+    <td></td> 
+</tr>
 <tr>
     <td>setSpeed</td>
     <td>1000</td>

app/protected/modules/accounts/tests/functional/cases/Delete.html

 <thead>
 <tr><td rowspan="1" colspan="3">Search</td></tr>
 </thead><tbody>
+<tr> 
+    <td>setTimeout</td> 
+    <td>45000</td> 
+    <td></td> 
+</tr>
 <tr>
     <td>setSpeed</td>
     <td>1000</td>

app/protected/modules/accounts/tests/functional/cases/ListViewHideShowColumns.html

 <thead>
 <tr><td rowspan="1" colspan="3">New Test</td></tr>
 </thead><tbody>
+<tr> 
+    <td>setTimeout</td> 
+    <td>45000</td> 
+    <td></td> 
+</tr>
 <tr>
 	<td>setSpeed</td>
 	<td>1000</td>
 	<td></td>
 </tr>
 <tr>
+  <td>click</td>
+  <td>id=clear-search-link</td>
+  <td></td>
+</tr>
+<tr>
+	<td>waitForTextNotPresent</td>
+	<td>Criteria Selected </td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>id=select-list-attributes-link</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>id=list-attributes-reset</td>
+	<td></td>
+</tr>
+<tr>
 	<td>click</td>
 	<td>id=select-list-attributes-link</td>
 	<td></td>
 	<td>Name</td>
 </tr>
 <tr>
-	<td>removeSelection</td>
-	<td>id=AccountsSearchForm_selectedListAttributes</td>
-	<td>label=Name</td>
-</tr>
-<tr>
-	<td>removeSelection</td>
-	<td>id=AccountsSearchForm_selectedListAttributes</td>
-	<td>label=Owner</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=yw2moveLeft</td>
-	<td></td>
-</tr>
-<tr>
-	<td>addSelection</td>
-	<td>id=AccountsSearchForm_selectedListAttributes</td>
-	<td>label=Owner</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=yw2moveLeft</td>
-	<td></td>
-</tr>
-<tr>
 	<td>click</td>
 	<td>css=#list-attributes-apply &gt; span.z-label</td>
 	<td></td>
 </tr>
 <tr>
-	<td>assertTextNotPresent</td>
-	<td>Type</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTextNotPresent</td>
-	<td>Owner</td>
-	<td></td>
-</tr>
-<tr>
 	<td>assertTextPresent</td>
 	<td>Name</td>
 	<td></td>
 </tr>
 <tr>
+	<td>assertTextPresent</td>
+	<td>Type</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTextPresent</td>
+	<td>Owner</td>
+	<td></td>
+</tr>
+<tr>
 	<td>click</td>
 	<td>id=select-list-attributes-link</td>
 	<td></td>
 </tr>
 <tr>
+	<td>removeSelection</td>
+	<td>id=AccountsSearchForm_selectedListAttributes_hidden</td>
+	<td>label=Annual Revenue</td>
+</tr>
+<tr>
+	<td>removeSelection</td>
+	<td>id=AccountsSearchForm_selectedListAttributes_hidden</td>
+	<td>label=Billing Address</td>
+</tr>
+<tr>
+	<td>removeSelection</td>
+	<td>id=AccountsSearchForm_selectedListAttributes_hidden</td>
+	<td>label=Created By User</td>
+</tr>
+<tr>
+	<td>removeSelection</td>
+	<td>id=AccountsSearchForm_selectedListAttributes_hidden</td>
+	<td>label=Created Date Time</td>
+</tr>
+<tr>
+	<td>removeSelection</td>
+	<td>id=AccountsSearchForm_selectedListAttributes_hidden</td>
+	<td>label=Description</td>
+</tr>
+<tr>
+	<td>removeSelection</td>
+	<td>id=AccountsSearchForm_selectedListAttributes_hidden</td>
+	<td>label=Employees</td>
+</tr>
+<tr>
+	<td>removeSelection</td>
+	<td>id=AccountsSearchForm_selectedListAttributes_hidden</td>
+	<td>label=Id</td>
+</tr>
+<tr>
+	<td>removeSelection</td>
+	<td>id=AccountsSearchForm_selectedListAttributes_hidden</td>
+	<td>label=Industry</td>
+</tr>
+<tr>
+	<td>removeSelection</td>
+	<td>id=AccountsSearchForm_selectedListAttributes_hidden</td>
+	<td>label=Modified By User</td>
+</tr>
+<tr>
+	<td>removeSelection</td>
+	<td>id=AccountsSearchForm_selectedListAttributes_hidden</td>
+	<td>label=Modified Date Time</td>
+</tr>
+<tr>
+	<td>removeSelection</td>
+	<td>id=AccountsSearchForm_selectedListAttributes_hidden</td>
+	<td>label=Office Fax</td>
+</tr>
+<tr>
+	<td>removeSelection</td>
+	<td>id=AccountsSearchForm_selectedListAttributes_hidden</td>
+	<td>label=Primary Email</td>
+</tr>
+<tr>
+	<td>removeSelection</td>
+	<td>id=AccountsSearchForm_selectedListAttributes_hidden</td>
+	<td>label=Secondary Email</td>
+</tr>
+<tr>
+	<td>removeSelection</td>
+	<td>id=AccountsSearchForm_selectedListAttributes_hidden</td>
+	<td>label=Shipping Address</td>
+</tr>
+<tr>
+	<td>removeSelection</td>
+	<td>id=AccountsSearchForm_selectedListAttributes_hidden</td>
+	<td>label=Website</td>
+</tr>
+<tr>
+	<td>addSelection</td>
+	<td>id=AccountsSearchForm_selectedListAttributes_hidden</td>
+	<td>label=Office Phone</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>id=yw2moveRight</td>
+	<td></td>
+</tr>
+<tr>
+	<td>addSelection</td>
+	<td>id=AccountsSearchForm_selectedListAttributes_hidden</td>
+	<td>label=Primary Email</td>
+</tr>
+<tr>
 	<td>click</td>
 	<td>id=yw2moveRight</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTextPresent</td>
-	<td>Industry</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTextPresent</td>
-	<td>Modified By User</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTextPresent</td>
-	<td>Employees</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTextPresent</td>
-	<td>Description</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTextPresent</td>
-	<td>Modified Date Time</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTextPresent</td>
-	<td>Office Fax</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTextPresent</td>
 	<td>Office Phone</td>
 	<td></td>
 </tr>
 </tr>
 <tr>
 	<td>assertTextPresent</td>
-	<td>Secondary Email</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTextPresent</td>
-	<td>Shipping Address</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTextPresent</td>
-	<td>Website</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTextPresent</td>
 	<td>Type</td>
 	<td></td>
 </tr>
 	<td></td>
 </tr>
 <tr>
-	<td>assertTextPresent</td>
-	<td>Annual Revenue</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTextPresent</td>
-	<td>Billing Address</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTextPresent</td>
-	<td>Created By User</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTextPresent</td>
-	<td>Created Date Time</td>
-	<td></td>
-</tr>
-<tr>
 	<td>click</td>
 	<td>id=select-list-attributes-link</td>
 	<td></td>
 </tr>
 <tr>
 	<td>assertTextNotPresent</td>
-	<td>Industry</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTextNotPresent</td>
-	<td>Modified By User</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTextNotPresent</td>
-	<td>Employees</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTextNotPresent</td>
-	<td>Description</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTextNotPresent</td>
-	<td>Modified Date Time</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTextNotPresent</td>
-	<td>Office Fax</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTextNotPresent</td>
 	<td>Primary Email</td>
 	<td></td>
 </tr>
-<tr>
-	<td>assertTextNotPresent</td>
-	<td>Secondary Email</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTextNotPresent</td>
-	<td>Shipping Address</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTextNotPresent</td>
-	<td>Website</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTextNotPresent</td>
-	<td>Annual Revenue</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTextNotPresent</td>
-	<td>Billing Address</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTextNotPresent</td>
-	<td>Created By User</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTextNotPresent</td>
-	<td>Created Date Time</td>
-	<td></td>
-</tr>
-
 </tbody></table>
 </body>
 </html>

app/protected/modules/accounts/tests/functional/cases/MassEdit.html

 <thead>
 <tr><td rowspan="1" colspan="3">Mass Edit</td></tr>
 </thead><tbody>
+<tr> 
+    <td>setTimeout</td> 
+    <td>45000</td> 
+    <td></td> 
+</tr>
 <tr>
     <td>setSpeed</td>
     <td>3000</td>

app/protected/modules/accounts/tests/functional/cases/OwnerTypeAhead.html

 <thead>
 <tr><td rowspan="1" colspan="3">Test User Type Ahead</td></tr>
 </thead><tbody>
+<tr> 
+    <td>setTimeout</td> 
+    <td>45000</td> 
+    <td></td> 
+</tr>
 <tr>
   <td>setSpeed</td>
   <td>1000</td>

app/protected/modules/accounts/tests/functional/cases/Search.html

 <thead>
 <tr><td rowspan="1" colspan="3">Search</td></tr>
 </thead><tbody>
+<tr> 
+    <td>setTimeout</td> 
+    <td>45000</td> 
+    <td></td> 
+</tr>
 <tr>
   <td>setSpeed</td>
   <td>1000</td>

app/protected/modules/conversations/messages/de/Default.php

                                      'in the CRM or perhaps something unrelated.  When you are conversing within the ' .
                                      'CRM, it is better than "ten" replies in email.' .
                                      'customer we interact with."</p>'
-            => '<h2>"A single conversation with a wise man is better than ten years of study."</h2><i>- Chinese proverb</i></i><div class="large-icon"></div><p>Start a conversation with someone "wise" in your organization about a record in the CRM or perhaps something unrelated.  When you are conversing within the CRM, it is better than "ten" replies in email.customer we interact with."</p>', // Same Word Translated
+            => '<h2>"A single conversation with a wise man is better than ten years of study."</h2><i>- Chinese proverb</i></i><div class="large-icon"></div><p>Start a conversation with someone "wise" in your organization about a record in the CRM or perhaps something unrelated.  When you are conversing within the CRM, it is better than "ten" replies in email."</p>', // Same Word Translated
         'Access Conversations Tab'
             => 'Zugang zu den Gesprächen',
         'Conversation'

app/protected/modules/missions/tests/functional/cases/Search.html

 	<td></td>
 </tr>
 <tr>
+	<td>waitForPageToLoad</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
 	<td>clickAndWait</td>
 	<td>link=Available</td>
 	<td></td>
 	<td></td>
 </tr>
 <tr>
+	<td>waitForPageToLoad</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
 	<td>clickAndWait</td>
 	<td>css=a.icon-missions-taken-but-not-accepted</td>
 	<td></td>

app/protected/modules/notes/tests/functional/cases/CreateNotesWIthAttachmentForAccounts.html

 	<td></td>
 </tr>
 <tr>
-	<td>assertVisible</td>
-	<td>link=testNotes.txt</td>
+	<td>waitForTextPresent</td>
+	<td>testNotes.txt</td>
 	<td></td>
 </tr>
 </tbody></table>

app/protected/modules/zurmo/components/WebUser.php

 
         protected function afterLogin($fromCookie)
         {
-            AuditEvent::logAuditEvent('UsersModule', UsersModule::AUDIT_EVENT_USER_LOGGED_IN);
-            if ($this->hasEventHandler('onAfterLogin'))
+            //Only run afterLogin when not coming from a cookie otherwise Yii::app()->user is not available.
+            if(!$fromCookie)
             {
-                $this->onAfterLogin(new CEvent($this));
+                AuditEvent::logAuditEvent('UsersModule', UsersModule::AUDIT_EVENT_USER_LOGGED_IN);
+                if ($this->hasEventHandler('onAfterLogin'))
+                {
+                    $this->onAfterLogin(new CEvent($this));
+                }
             }
+
         }
 
         /**