Changeset 6393 for trunk/prototype
- Timestamp:
- 06/02/12 17:33:39 (12 years ago)
- Location:
- trunk/prototype/modules/calendar
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/prototype/modules/calendar/interceptors/DBMapping.php
r6369 r6393 261 261 Controller::begin(array('service' => 'PostgreSQL')); 262 262 263 foreach ($result as $id => $res) 264 Controller::service('PostgreSQL')->execResultSql("INSERT INTO calendar_repeat_occurrence(repeat_id,occurrence)VALUES('" . $id . "','" . implode("'),('" . $id . "', '", $res) . "')"); 265 263 foreach ($result as $id => $res){ 264 265 $ocurrences = array_unique($res); 266 Controller::service('PostgreSQL')->execResultSql("INSERT INTO calendar_repeat_occurrence(repeat_id,occurrence)VALUES('" . $id . "','" . implode("'),('" . $id . "', '", $ocurrences) . "')"); 267 } 266 268 $data = array(); 267 269 -
trunk/prototype/modules/calendar/js/helpers.js
r6371 r6393 1411 1411 1412 1412 if(!!data.result && data.result != "[]"){ 1413 var newAttach = jQuery.parseJSON(data.result);1413 var newAttach = (attch = jQuery.parseJSON(data.result)) ? attch : jQuery.parseJSON(data.result[0].activeElement.childNodes[0].data); 1414 1414 $('.attachment-list').append('<input tyepe="hidden" name="attachment[]" value="'+newAttach['attachment'][0][0].id+'"/>'); 1415 1415 currentUpload.removeClass('on-complete').parents('p') … … 1421 1421 }); 1422 1422 $('.attachments-list .button').button(); 1423 1423 1424 if(!!window.FormData) 1424 1425 $('#fileupload').bind('fileuploadstart', function () { 1425 1426 var widget = $(this), -
trunk/prototype/modules/calendar/templates/alarms_add_itemlist.ejs
r5652 r6393 6 6 <option value="alert" <%= data.alarm.defaultAlarms[i].type=='alert' ? 'selected="selected"':'' %>>Alerta</option> 7 7 <option value="mail" <%= data.alarm.defaultAlarms[i].type=='mail' ? 'selected="selected"':'' %>>E-mail</option> 8 < option value="sms" <%= data.alarm.defaultAlarms[i].type=='sms' ? 'selected="selected"':'' %>>SMS</option>8 <!--<option value="sms" <%= data.alarm.defaultAlarms[i].type=='sms' ? 'selected="selected"':'' %>>SMS</option>--> 9 9 </select> 10 10 <input type="text" name="alarmTime[]" class="number input-small" value="<%= data.alarm.defaultAlarms[i].time %>"/> -
trunk/prototype/modules/calendar/templates/event_add.ejs
r6369 r6393 9 9 <input type="hidden" class="id-event" name="idEvent" value="<%= data.event.id %>"/> 10 10 <% } %> 11 <% if( data.event. calendar ){ %>11 <% if( data.event.id && data.event.calendar ){ %> 12 12 <input type="hidden" class="last-calendar" name="lastCalendar" value="<%= data.event.calendar %>"/> 13 13 <% } %>
Note: See TracChangeset
for help on using the changeset viewer.