[Fmsystem-commits] [10006]

[Torstein]

Revision: 10006
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10006
Author:   vator
Date:     2012-09-18 07:49:45 +0000 (Tue, 18 Sep 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/js/controller/ajax.js
    trunk/controller/templates/base/calendar/select_buildings_on_property.xsl

Modified: trunk/controller/js/controller/ajax.js
===================================================================
--- trunk/controller/js/controller/ajax.js      2012-09-18 05:51:13 UTC (rev 
10005)
+++ trunk/controller/js/controller/ajax.js      2012-09-18 07:49:45 UTC (rev 
10006)
@@ -950,20 +950,22 @@
                 var year = $(thisForm).find("input[name='year']").val();
                 var month = $(thisForm).find("input[name='month']").val();
                 
-                if(period_type == 'view_month')
+                if(location_code != "" & period_type == 'view_month')
                 {
                         var oArgs = 
{menuaction:'controller.uicalendar.view_calendar_for_month'};
                         var baseUrl = phpGWLink('index.php', oArgs, false);
                         var requestUrl = baseUrl + "&location_code=" + 
location_code + "&year=" + year + "&month=" + month;
+                        
+                        window.location.href = requestUrl;
                 }
-                else
+                else if(location_code != "" & period_type == 'view_year')
                 {
                         var oArgs = 
{menuaction:'controller.uicalendar.view_calendar_for_year'};
                         var baseUrl = phpGWLink('index.php', oArgs, false);
                         var requestUrl = baseUrl +  "&location_code=" + 
location_code + "&year=" + year;
+                        
+                        window.location.href = requestUrl;
                 }
-               
-                window.location.href = requestUrl;
     });
        
        // CALENDAR FILTERS  

Modified: 
trunk/controller/templates/base/calendar/select_buildings_on_property.xsl
===================================================================
--- trunk/controller/templates/base/calendar/select_buildings_on_property.xsl   
2012-09-18 05:51:13 UTC (rev 10005)
+++ trunk/controller/templates/base/calendar/select_buildings_on_property.xsl   
2012-09-18 07:49:45 UTC (rev 10006)
@@ -10,7 +10,7 @@
     </input>
                
     <select id="choose_building_on_property" class="selectLocation">
-      <option>Velg bygg</option>
+      <option value="">Velg bygg</option>
       <xsl:for-each select="buildings_on_property">
         <option>
           <xsl:if test="id = //current_location/location_code">