Просмотр исходного кода

Timezone warning / add entry no-reload

Malishev Dmitry 14 лет назад
Родитель
Сommit
79699b83be
3 измененных файлов с 16 добавлено и 10 удалено
  1. 2 0
      web/dispatch.php
  2. 13 5
      web/js/actions.js
  3. 1 5
      web/js/model.js

+ 2 - 0
web/dispatch.php

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

+ 13 - 5
web/js/actions.js

@@ -252,11 +252,19 @@ App.Actions.save_form = function(evt) {
     }
     
     if (elm.attr('id') == App.Constants[elm_id]) { // NEW ITEM
-        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();
+        if ($('.b-new-entry').length > 1) {
+            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.');
+            if (!confirmed) {
+                return true;
+            }
+            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

+ 1 - 5
web/js/model.js

@@ -82,6 +82,7 @@ App.Model.CRON.loadList = function(callback)
 App.Model.add = function(values, source_json) 
 {    
     var method = App.Settings.getMethodName('add');
+
     App.Ajax.request(method, {
         spell: $.toJSON(values)
     }, 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) );
         }
         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.Helpers.updateScreen();
         }
     });
 }