[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

SF.net SVN: ledger-smb:[2609] trunk

Revision: 2609
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=2609&view=rev
Author:   einhverfr
Date:     2009-05-21 20:55:32 +0000 (Thu, 21 May 2009)

Log Message:
-----------
Rolling back ajax stuff on GL search for now

Modified Paths:
--------------
    trunk/UI/journal/search.html
    trunk/t/04-template-handling.t

Modified: trunk/UI/journal/search.html
===================================================================
--- trunk/UI/journal/search.html	2009-05-21 16:24:00 UTC (rev 2608)
+++ trunk/UI/journal/search.html	2009-05-21 20:55:32 UTC (rev 2609)
@@ -1,6 +1,4 @@
-<?lsmb INCLUDE 'ui-header.html' 
-       	include_script = ["UI/ajax/scriptaculous/lib/prototype.js","UI/ajax/scriptaculous/src/scriptaculous.js?load=builder,effects,dragdrop,controls","UI/ajax/helpers.js"]
-?>
+<?lsmb INCLUDE 'ui-header.html' ?>
 <?lsmb PROCESS 'elements.html' ?>
 <body>
 
@@ -30,13 +28,11 @@
         </tr>
          <tr>
           <th align="right"><?lsmb text('Account') ?></th>
-          <td colspan="3">
-              <?lsmb PROCESS ajaxselect element_data = {
+          <td><?lsmb PROCESS select element_data = {
                      name = "account"
-                     initial_value = all_accounts.1.values.1 _ '--' _ all_accounts.1.values.3
+                     options = all_accounts 
                      text_attr = 'accno'
                      value_attr = 'id'
-                     ajax_target = '/journal.pl'
               } ?> </td>
 	  </tr>
 	  <tr>

Modified: trunk/t/04-template-handling.t
===================================================================
--- trunk/t/04-template-handling.t	2009-05-21 16:24:00 UTC (rev 2608)
+++ trunk/t/04-template-handling.t	2009-05-21 20:55:32 UTC (rev 2609)
@@ -429,7 +429,7 @@
 is(grep (/value="1" selected="selected">test1/, @output), 0, 'Select box Value 1 unselected');
 is(grep (/value="1000" selected="selected">test2/, @output), 1, 'Select box Value 1000 selected');
 is(grep (/<td class="description">dtest1/, @output), 1, 'Contact description shows');
-is(grep (/value="4" selected="selected">country4/, @output), 1, 'Default Country Set');
+is(grep (/value="4" selected="selected">country4/, @output), 2, 'Default Country Set');
 # bulk payment template tests
 my $payment = LedgerSMB->new();
 $payment->merge({


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.