github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-07-14 00:53:30 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Timezone warning / add entry no-reload

Browse source
This commit is contained in:
Malishev Dmitry 2011-12-29 16:38:42 +03:00
parent 511703fa3e
commit 79699b83be
3 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
web/dispatch.php
View file

@ -1,5 +1,7 @@
<?php <?php
date_default_timezone_set('Europe/Moscow');
require dirname(__FILE__) . DIRECTORY_SEPARATOR . 'vesta/core/utils/error_logger.php'; require dirname(__FILE__) . DIRECTORY_SEPARATOR . 'vesta/core/utils/error_logger.php';
require dirname(__FILE__) . DIRECTORY_SEPARATOR . 'vesta/app.init.php'; require dirname(__FILE__) . DIRECTORY_SEPARATOR . 'vesta/app.init.php';

18
web/js/actions.js
View file

@ -252,11 +252,19 @@ App.Actions.save_form = function(evt) {
} }
if (elm.attr('id') == App.Constants[elm_id]) { // NEW ITEM if (elm.attr('id') == App.Constants[elm_id]) { // NEW ITEM
var values = App.Helpers.getFormValues(elm); if ($('.b-new-entry').length > 1) {
if(App.Validate.form(values, $('#'+elm_id))) { var confirmed = confirm('You were editing other entries and those changes will be discarded. Click cancel if you want to save updated entries before adding new one.');
App.Model.add(values, source); if (!confirmed) {
var form_id = App.Constants[App.Env.world + '_FORM_ID']; return true;
$('#'+form_id).remove(); }
else {
var values = App.Helpers.getFormValues(elm);
if(App.Validate.form(values, $('#'+elm_id))) {
App.Model.add(values, source);
var form_id = App.Constants[App.Env.world + '_FORM_ID'];
$('#'+form_id).remove();
}
}
} }
} }
else { // OLD ITEM, UPDATING IT else { // OLD ITEM, UPDATING IT

6
web/js/model.js
View file

@ -82,6 +82,7 @@ App.Model.CRON.loadList = function(callback)
App.Model.add = function(values, source_json) App.Model.add = function(values, source_json)
{ {
var method = App.Settings.getMethodName('add'); var method = App.Settings.getMethodName('add');
App.Ajax.request(method, { App.Ajax.request(method, {
spell: $.toJSON(values) spell: $.toJSON(values)
}, function(reply){ }, function(reply){
@ -89,12 +90,7 @@ App.Model.add = function(values, source_json)
App.Helpers.Warn('Changes were not applied ' + App.Helpers.toJSON(reply.errors) ); App.Helpers.Warn('Changes were not applied ' + App.Helpers.toJSON(reply.errors) );
} }
else { else {
/*var build_method = App.Env.getWorldName() + '_entry';
var tpl = App.HTML.Build[build_method](values, 'new');
App.Ref.CONTENT..replaceWith(tpl);*/
// todo: reply.data;
App.Pages.prepareHTML(); App.Pages.prepareHTML();
App.Helpers.updateScreen();
} }
}); });
} }