Version bump to 1.2.0, functional under rails3 with various small cleanups - wa… | |
Log | |
Files | |
Refs | |
README | |
--- | |
commit c277049cd337d91d4e54afc9a7744bcc17bb988f | |
parent c8b8955ad31bc7f3b6a50cbeacd8261c88c17305 | |
Author: HD Moore <[email protected]> | |
Date: Wed, 23 Feb 2011 20:59:57 +0000 | |
Version bump to 1.2.0, functional under rails3 with various small cleanups | |
Diffstat: | |
M docs/ChangeLog | 6 ++++++ | |
M lib/warvox.rb | 2 +- | |
M web/app/controllers/analyze_contro… | 2 +- | |
M web/app/controllers/dial_results_c… | 9 +++------ | |
M web/app/views/shared/_footer.html.… | 2 +- | |
5 files changed, 12 insertions(+), 9 deletions(-) | |
--- | |
diff --git a/docs/ChangeLog b/docs/ChangeLog | |
@@ -1,3 +1,9 @@ | |
+2011-02-23 H D Moore <hdm[at]metasploit.com> | |
+ * bumped the version number to 1.2.0 | |
+ * applied patch from mediaservice for iaxclient v2 test mode | |
+ * fixed pagination issues with rails 3 | |
+ * updated the copyright for 2011 | |
+ | |
2010-11-03 H D Moore <hdm[at]metasploit.com> | |
* bumped the version number to 1.1.0 | |
* upgraded the web interface to Rails 3 | |
diff --git a/lib/warvox.rb b/lib/warvox.rb | |
@@ -11,7 +11,7 @@ require 'warvox/db' | |
# Global configuration | |
module WarVOX | |
- VERSION = '1.1.0' | |
+ VERSION = '1.2.0' | |
Base = File.expand_path(File.join(File.dirname(__FILE__), '..')) | |
Conf = File.expand_path(File.join(Base, 'etc', 'warvox.conf')) | |
JobManager = WarVOX::JobQueue.new | |
diff --git a/web/app/controllers/analyze_controller.rb b/web/app/controllers/an… | |
@@ -2,7 +2,7 @@ class AnalyzeController < ApplicationController | |
layout 'warvox' | |
def index | |
- @jobs = DialJob.where(:dial_job => true).paginate( | |
+ @jobs = DialJob.paginate( | |
:page => params[:page], | |
:order => 'id DESC', | |
:per_page => 30 | |
diff --git a/web/app/controllers/dial_results_controller.rb b/web/app/controlle… | |
@@ -4,8 +4,7 @@ class DialResultsController < ApplicationController | |
# GET /dial_results | |
# GET /dial_results.xml | |
def index | |
- @completed_jobs = DialJob.paginate_all_by_status( | |
- 'completed', | |
+ @completed_jobs = DialJob.where(:status => 'completed').paginate( | |
:page => params[:page], | |
:order => 'id DESC', | |
:per_page => 30 | |
@@ -62,8 +61,7 @@ class DialResultsController < ApplicationController | |
@g1.data = res_types | |
- @dial_data_todo = DialResult.paginate_all_by_dial_job_id( | |
- @job_id, | |
+ @dial_data_todo = DialResult.where(:dial_job_id => @job_id).paginate( | |
:page => params[:page], | |
:order => 'number ASC', | |
:per_page => 50, | |
@@ -78,8 +76,7 @@ class DialResultsController < ApplicationController | |
# GET /dial_results/1/view | |
# GET /dial_results/1/view.xml | |
def view | |
- @dial_results = DialResult.paginate_all_by_dial_job_id( | |
- params[:id], | |
+ @dial_results = DialResult.where(:dial_job_id => params[:id]).paginate( | |
:page => params[:page], | |
:order => 'number ASC', | |
:per_page => 30 | |
diff --git a/web/app/views/shared/_footer.html.erb b/web/app/views/shared/_foot… | |
@@ -1,5 +1,5 @@ | |
<div id="footer"> | |
<div id='copyright'> | |
- Copyright ©2009-2010 Rapid7 LLC<br/> | |
+ Copyright ©2009-2011 Rapid7 LLC<br/> | |
</div> | |
</div> |