[Fmsystem-commits] [9734] Organizations now show in event table

[Alexander Stevenson]

Revision: 9734
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9734
Author:   andvare
Date:     2012-07-04 12:25:59 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
Organizations now show in event table

Modified Paths:
--------------
    branches/stavangerkommune/booking/inc/class.uievent.inc.php
    branches/stavangerkommune/booking/js/booking/datatable.js

Modified: branches/stavangerkommune/booking/inc/class.uievent.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.uievent.inc.php 2012-07-04 
12:25:38 UTC (rev 9733)
+++ branches/stavangerkommune/booking/inc/class.uievent.inc.php 2012-07-04 
12:25:59 UTC (rev 9734)
@@ -94,6 +94,10 @@
                                                        'label' => 
lang('Activity'),
                                                ),
                                                array(
+                                                       'key' => 
'customer_organization_name',
+                                                       'label' => 
lang('Organization'),
+                                               ),
+                                               array(
                                                        'key' => 'contact_name',
                                                        'label' => 
lang('Contact'),
                                                ),

Modified: branches/stavangerkommune/booking/js/booking/datatable.js
===================================================================
--- branches/stavangerkommune/booking/js/booking/datatable.js   2012-07-04 
12:25:38 UTC (rev 9733)
+++ branches/stavangerkommune/booking/js/booking/datatable.js   2012-07-04 
12:25:59 UTC (rev 9734)
@@ -168,10 +168,10 @@
        
        var initialRequest = History.getBookmarkedState("state") || getState();
        History.register("state", initialRequest, handleHistoryNavigation);
-       History.onReady(function() {
-               var state = YAHOO.util.History.getCurrentState('state');
-               handleHistoryNavigation(state);
-       });
+//     History.onReady(function() {
+//             var state = YAHOO.util.History.getCurrentState('state');
+//             handleHistoryNavigation(state);
+//     });
        History.initialize("yui-history-field", "yui-history-iframe");
 };