Merge pull request #59 from slims/develop

Develop

changes.txt

@@ -40,6 +40,10 @@ Drajat Hasan ([email protected])
 
 THANKS TO OUR USERS AND COMMUNITIES, YOU ARE DEVELOPERS TOO!
 
+SLiMS 9.3.1 (Bulian)
+========================================================================
+Fix : upgrade error.
+
 SLiMS 9.3.0 (Bulian)
 ========================================================================
 Added : Print catalog option

install/Upgrade.inc.php

@@ -973,9 +973,16 @@ function upgrade_role_26()
 
       $sql['alter'][] = "ALTER TABLE `files_read` CHANGE `member_id` `member_id` varchar(20) NULL AFTER `date_read`;";
 
-      $sql['alter'][] = "ALTER TABLE `backup_log` CHANGE `backup_file` `backup_file` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;"
+      $sql['alter'][] = "ALTER TABLE `backup_log` CHANGE `backup_file` `backup_file` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;";
 
       return $this->slims->query($sql, ['create', 'alter']);
   }
 
+    /**
+     * Upgrade role to v9.3.1
+     */
+    function upgrade_role_27()
+    {
+    }
+
 }

install/sections/SelectVersion.js

@@ -47,6 +47,7 @@ export default {
                 {value: 23, text: 'SLiMS 9.2.0 | Bulian'},
                 {value: 24, text: 'SLiMS 9.2.1 | Bulian'},
                 {value: 25, text: 'SLiMS 9.2.2 | Bulian'},
+                {value: 26, text: 'SLiMS 9.3.0 | Bulian'},
             ]
         }
     },

install/senayan.sql

@@ -13,7 +13,7 @@ CREATE TABLE IF NOT EXISTS `backup_log` (
   `backup_log_id` int(11) NOT NULL auto_increment,
   `user_id` int(11) NOT NULL default '0',
   `backup_time` datetime not NULL,
-  `backup_file` varchar(100) collate utf8_unicode_ci default NULL,
+  `backup_file` text collate utf8_unicode_ci default NULL,
   PRIMARY KEY  (`backup_log_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
 

simbio2/simbio_FILE/simbio_file_upload.inc.php

@@ -157,9 +157,11 @@ public function chunkUpload($tmpfile,$target_file){
         if($upload_start % 10000 == 0){
             $count = array('data'=>array('upload_progress' => ceil(($upload_start/$orig_file_size)*100).'%'));
         }
-        echo '<script type="text/javascript">';
-        echo 'console.log(\''.json_encode($count).'\')';
-        echo '</script>';
+        if (ENVIRONMENT === 'development') {
+            echo '<script type="text/javascript">';
+            echo 'console.log(\''.json_encode($count).'\')';
+            echo '</script>';
+        }
         $upload_start += strlen($contents);
         fseek($handle, $upload_start);
     }

sysconfig.inc.php

@@ -66,7 +66,7 @@
 
 // senayan version
 define('SENAYAN_VERSION', 'SLiMS 9 (Bulian)');
-define('SENAYAN_VERSION_TAG', 'v9.3.0');
+define('SENAYAN_VERSION_TAG', 'v9.3.1');
 
 // senayan session cookies name
 define('COOKIES_NAME', 'SenayanAdmin');