small fixes

tim4dev · Aug 13, 2011 · 3faf91f · 3faf91f
1 parent a1c3cc6
commit 3faf91f
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 7 deletions.
diff --git a/README b/README
@@ -1,7 +1,7 @@
 
 Webacula - Web Bacula -	web interface of a Bacula backup system http://www.bacula.org/
 
-Version: 5.5.0
+Version: 5.5.1
 
 http://webacula.sourceforge.net/
 http://github.com/tim4dev/webacula

diff --git a/UPDATE b/UPDATE
@@ -1 +1 @@
-Please see the "Update" chapter of file docs/INSTALL
+Please see the "Update from prior version" chapter of file docs/txt/install.txt
diff --git a/application/views/scripts/help/index.phtml b/application/views/scripts/help/index.phtml
@@ -6,7 +6,7 @@
 <a href="http://webacula.sourceforge.net/" name="webacula" target="_blank">
 Webacula</a>
 </strong> - <strong>We</strong>b + <strong>Bacula</strong> -
-<?php echo $this->translate->_('web interface of a');?>
+<?php echo $this->translate->_('web interface of a');?>&nbsp;
 <a href="http://www.bacula.org/" name="Bacula" target="_blank">Bacula backup system</a>.</p>
 
 <p>&nbsp;</p>

diff --git a/html/index.php b/html/index.php
@@ -18,7 +18,7 @@
  *
  */
 
-define('WEBACULA_VERSION', '5.5.0' . ', build 2011.05.11');
+define('WEBACULA_VERSION', '5.5.1' . ', build 2011.08.13');
 define('BACULA_VERSION', 12); // Bacula Catalog version
 
 define('ROOT_DIR', dirname(dirname(__FILE__)) );

diff --git a/packaging/Fedora/webacula.spec b/packaging/Fedora/webacula.spec
@@ -1,5 +1,5 @@
 Name:          webacula
-Version:       5.5.0
+Version:       5.5.1
 Release:       1%{?dist}
 Summary:       Web interface of a Bacula backup system
 Summary(ru):   Веб интерфейс для Bacula backup system
@@ -116,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 13 2011 Yuri Timofeev <tim4dev@gmail.com> 5.5.1-1
+- Version 5.5.1
+
 * Mon Jan 24 2011 Yuri Timofeev <tim4dev@gmail.com> 5.5.0-1
 - Version 5.5.0
 

diff --git a/tests/application/controllers/LogControllerTest.php b/tests/application/controllers/LogControllerTest.php
@@ -19,7 +19,7 @@ public function testViewConsoleLog ()
             throw new RuntimeException('Non-english characters not found!');
         $this->assertController('log');
         $this->assertAction('view-log-id');
-        $this->assertNotQueryContentRegex('table', self::ZF_pattern); // Zend Framework
+        $this->assertNotQueryContentRegex('table', '/Exception:|Notice:|Call Stack/'); // иногда Bacula глючит и выдает Warning в логах
         $this->assertResponseCode(200);
         $this->assertNotQueryContentContains('div', 'No Console messages found');
         $this->assertQueryContentRegex('table', '/Termination:.*Backup OK/');

diff --git a/tests/prepare_tests/MySql/10_bacula_make_tables b/tests/prepare_tests/MySql/10_bacula_make_tables
@@ -323,7 +323,7 @@ CREATE TABLE UnsavedFiles (
 CREATE TABLE Counters (
    Counter TINYBLOB NOT NULL,
    MinValue INTEGER DEFAULT 0,
-   MaxValue INTEGER DEFAULT 0,
+   \`MaxValue\` INTEGER DEFAULT 0,
    CurrentValue INTEGER DEFAULT 0,
    WrapCounter TINYBLOB NOT NULL,
    PRIMARY KEY (Counter(128))