Skip to content

Commit 692c5f7

Browse files
committed
Merge pull request #68 from jmontoyaa/1.9.x
Fixing js error in e4373fb
2 parents 41aebd7 + cc4d83f commit 692c5f7

File tree

1 file changed

+30
-25
lines changed

1 file changed

+30
-25
lines changed

main/template/default/agenda/month.tpl

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -180,33 +180,38 @@ $(document).ready(function() {
180180
url: url+'&'+params,
181181
success:function(data) {
182182
var user = $('#users_to_send_id').val();
183-
if (user.length > 1) {
184-
user = 0;
183+
if (user) {
184+
185+
if (user.length > 1) {
186+
user = 0;
187+
} else {
188+
user = user[0];
189+
}
190+
var user_length = String(user).length;
191+
if (String(user).substring(0,1) == 'G') {
192+
var user_id = String(user).substring(6,user_length);
193+
var user_id = "G:"+user_id;
194+
} else {
195+
var user_id = String(user).substring(5,user_length);
196+
}
197+
var temp = "&user_id="+user_id;
198+
var position =String(window.location).indexOf("&user");
199+
var url_length = String(window.location).length;
200+
var url = String(window.location).substring(0, position)+temp;
201+
202+
if (position > 0) {
203+
window.location.replace(url);
204+
} else {
205+
url = String(window.location)+temp;
206+
window.location.replace(url);
207+
}
185208
} else {
186-
user = user[0];
209+
calendar.fullCalendar("refetchEvents");
210+
calendar.fullCalendar("rerenderEvents");
187211
}
188-
var user_length = String(user).length;
189-
if (String(user).substring(0,1) == 'G') {
190-
var user_id = String(user).substring(6,user_length);
191-
var user_id = "G:"+user_id;
192-
} else {
193-
var user_id = String(user).substring(5,user_length);
194-
}
195-
var temp = "&user_id="+user_id;
196-
var position =String(window.location).indexOf("&user");
197-
var url_length = String(window.location).length;
198-
var url = String(window.location).substring(0,position)+temp;
199-
if (position > 0) {
200-
window.location.replace(url);
201-
} else {
202-
url = String(window.location)+temp;
203-
window.location.replace(url);
204-
}
205-
//calendar.fullCalendar("refetchEvents");
206-
//calendar.fullCalendar("rerenderEvents");
212+
207213
$("#dialog-form").dialog("close");
208-
209-
}
214+
}
210215
});
211216
}
212217
},
@@ -530,4 +535,4 @@ $(document).ready(function() {
530535
</div>
531536
</div>
532537
<div id="loading" style="margin-left:150px;position:absolute;display:none">{{ "Loading"|get_lang }}...</div>
533-
<div id="calendar"></div>
538+
<div id="calendar"></div>

0 commit comments

Comments
 (0)