Minor fixes

sergejey · Sep 23, 2019 · 9adc72c · zimur · Sep 23, 2019 · sergejey
1 parent 375df23
commit 9adc72c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 11 deletions.
diff --git a/3rdparty/googleblockly/blocks/majordomo_states.js.php b/3rdparty/googleblockly/blocks/majordomo_states.js.php
@@ -36,29 +36,33 @@
 include_once("./config.php");
 include_once("./lib/loader.php");
 
-$session=new session("prj");
+$session = new session("prj");
 
 include_once("./load_settings.php");
 include_once(DIR_MODULES . "control_modules/control_modules.class.php");
 
-    $objects = getObjectsByClass('OperationalModes');
+$objects = getObjectsByClass('OperationalModes');
 
-    foreach($objects as $object) {
+
-        $object = SQLSelectOne("SELECT * FROM objects WHERE ID=".$object['ID']);
+foreach($objects as $object) {
-        ?>
+$object = SQLSelectOne("SELECT * FROM objects WHERE ID=" . $object['ID']);
+if (!$object['DESCRIPTION']) {
+    $object['DESCRIPTION']=$object['TITLE'];
+}
+?>
 
 Blockly.Blocks['majordomo_<?php echo $object['TITLE']?>'] = {
-    init: function() {
+    init: function () {
         var thisBlock = this;
         this.setColour(220);
         this.appendDummyInput()
-            .appendField('<?php echo addcslashes($object['DESCRIPTION'],"'")?>');
+            .appendField('<?php echo addcslashes($object['DESCRIPTION'], "'")?>');
         this.setOutput(true);
         this.setTooltip('');
     }
 };
 
 <?php
-    }
+}
 
 $session->save();
diff --git a/modules/objects/objects.class.php b/modules/objects/objects.class.php
@@ -511,7 +511,7 @@ function callMethodSafe($name, $params = 0)
 
         $call_stack[] = $current_call;
         if (!is_array($params)) {
-            $params = array($params);
+            $params = array();
         }
         $params['m_c_s'] = $call_stack;
         $result = callAPI('/api/method/' . urlencode($this->object_title . '.' . $name), 'GET', $params);

diff --git a/modules/xray/xray.class.php b/modules/xray/xray.class.php
@@ -445,6 +445,11 @@ function admin(&$out)
                 }
                 */
             }
+
+            if ($cmd!='') {
+                $this->redirect(ROOTHTML."panel/xray.html?view_mode=".$this->view_mode);
+            }
+
         }
         if ($this->view_mode == 'timers') {
             global $cmd;
@@ -548,7 +553,7 @@ function admin(&$out)
 
                     header("HTTP/1.0: 200 OK\n");
                     header('Content-Type: text/html; charset=utf-8');
-                    $limit = $out['LIMIT'];
+                    $limit = $out['LINES'];
                     $filter = $out['FILTER'];
                     if (!$limit) {
                         $limit = 50;

diff --git a/templates/scripts/scripts_edit.html b/templates/scripts/scripts_edit.html
@@ -11,7 +11,8 @@
 [#if ID=""#]
 <#LANG_NEW_SCRIPT#>
 [#else#]
-<#LANG_EDIT_RECORD#>
+<#LANG_EDIT_RECORD#>:
+    <a href="?view_mode=<#VIEW_MODE#>&id=[#ID#]">[#TITLE#]</a>
 [#endif#]
 </li>
 </ul>