 |
Switch to the public gemfile path instead - warvox - VoIP based wardialing tool… |
 |
Log |
|
Files |
|
Refs |
|
README |
|
--- |
|
commit c7b92e9931ca984162d78371fc1feae1be21c783 |
|
parent 267f835bb1298e0aafcfa095971be2f03573f3bd |
 |
Author: HD Moore <[email protected]> |
|
Date: Mon, 14 Jan 2013 09:12:20 -0600 |
|
|
|
Switch to the public gemfile path instead |
|
|
|
Diffstat: |
|
M Gemfile | 2 +- |
|
M app/controllers/jobs_controller.rb | 8 ++++++-- |
|
M app/views/jobs/index.html.erb | 2 +- |
|
M app/views/jobs/new_analyze.html.erb | 9 +++++++-- |
|
M app/views/projects/show.html.erb | 2 +- |
|
M config/routes.rb | 11 ++++++----- |
|
|
|
6 files changed, 22 insertions(+), 12 deletions(-) |
|
--- |
|
diff --git a/Gemfile b/Gemfile |
|
@@ -33,7 +33,7 @@ gem 'rails_bootstrap_navbar' |
|
gem 'less-rails-bootstrap' |
|
gem 'therubyracer' |
|
|
|
-gem 'reportable', :git => '[email protected]:hmoore-r7/reportable.git', :require … |
|
+gem 'reportable', :git => 'git://github.com/hmoore-r7/reportable.git', :requir… |
|
|
|
gem 'will_paginate', '~> 3.0' |
|
gem 'will_paginate-bootstrap' |
|
diff --git a/app/controllers/jobs_controller.rb b/app/controllers/jobs_controll… |
|
@@ -146,11 +146,15 @@ class JobsController < ApplicationController |
|
end |
|
|
|
def purge_calls |
|
- @job = Job.find(params[:id]) |
|
Call.delete_all(:id => params[:result_ids]) |
|
CallMedium.delete_all(:call_id => params[:result_ids]) |
|
flash[:notice] = "Purged #{params[:result_ids].length} calls" |
|
- redirect_to view_results_path(@job.project_id, @job.id) |
|
+ if params[:id] |
|
+ @job = Job.find(params[:id]) |
|
+ redirect_to view_results_path(@job.project_id, @job.id) |
|
+ else |
|
+ redirect_to analyze_path(@project) |
|
+ end |
|
end |
|
|
|
def dialer |
|
diff --git a/app/views/jobs/index.html.erb b/app/views/jobs/index.html.erb |
|
@@ -62,7 +62,7 @@ |
|
<a class="btn" href="<%= view_results_path(job.project,job… |
|
<% end %> |
|
<% if job.task == "analysis" and job.details[:scope].to_s != "call… |
|
- <a class="btn" href="<%= view_analyze_path(job.project,job… |
|
+ <a class="btn" href="<%= view_analyze_path(job.project,job… |
|
<% end %> |
|
<a class="btn" href="<%= stop_job_path(job) %>" data-confirm="… |
|
</td> |
|
diff --git a/app/views/jobs/new_analyze.html.erb b/app/views/jobs/new_analyze.h… |
|
@@ -1,9 +1,14 @@ |
|
<h1 class='title'>Call Analysis</h1> |
|
|
|
<%= semantic_form_for(@job, :url => analyze_project_job_path(@project) ) do |f… |
|
+ |
|
+ <% if @project %> |
|
+ <%= f.input :project_id, :as => :hidden, :input_html => { :value => @p… |
|
+ <% else %> |
|
<%= f.input :project, :as => :select %> |
|
- <br/> |
|
- <%= f.input :force, :as => :boolean, :label => 'Process previously an… |
|
+ <% end %> |
|
+ |
|
+ <%= f.input :force, :as => :boolean, :label => 'Process previously an… |
|
<%= f.action :submit, :label => 'Analyze', :button_html => { :class =>… |
|
|
|
<a class="btn btn-link" href="<%= project_path(@project) %>" rel="tool… |
|
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb |
|
@@ -18,7 +18,7 @@ |
|
<div class="span2"> </div> |
|
<div class="span2"><a href="<%= new_dialer_project_job… |
|
<% if @boxes[:answered][:cnt] > 0 %> |
|
- <div class="span2"><a href="<%= new_analyze_job_path %… |
|
+ <div class="span2"><a href="<%= new_analyze_project_jo… |
|
<div class="span2"><a href="#" class="btn" rel="toolti… |
|
<div class="span2"><a href="#" class="btn" rel="toolti… |
|
<% else %> |
|
diff --git a/config/routes.rb b/config/routes.rb |
|
@@ -10,11 +10,13 @@ Web::Application.routes.draw do |
|
|
|
match '/jobs/dial' => 'jobs#new_dialer', :as => :new_dialer_job |
|
match '/projects/:project_id/jobs/dial' => 'jobs#new_dialer', … |
|
- |
|
match '/jobs/dialer' => 'jobs#dialer', :as => :dialer_job |
|
+ |
|
match '/jobs/analyze' => 'jobs#new_analyze', :as => :new_analyze_j… |
|
+ match '/projects/:project_id/jobs/analyze' => 'jobs#new_analyze', … |
|
match '/jobs/analyzer' => 'jobs#analyzer', :as => :analyzer_job |
|
- match '/jobs/identify' => 'jobs#new_identify', :as => :new_identify_… |
|
+ |
|
+ match '/projects/:project_id/jobs/identify' => 'jobs#new_identify', … |
|
match '/jobs/identifier' => 'jobs#identifier', :as => :identifier_job |
|
|
|
match '/jobs/:id/stop' => 'jobs#stop', :as => :stop_job |
|
@@ -27,9 +29,8 @@ Web::Application.routes.draw do |
|
match '/projects/:project_id/scans/:id/analyze' => 'jobs#analyze_job', :… |
|
match '/projects/:project_id/scans/:id/reanalyze' => 'jobs#reanalyze_job',… |
|
|
|
- match '/projects/:project_id/all/analyze' => 'jobs#analyze_project', :… |
|
- match '/projects/:project_id/all/identify' => 'jobs#identify_project', … |
|
- |
|
+ match '/projects/:project_id/calls/analyze' => 'jobs#analyze_project',… |
|
+ match '/projects/:project_id/calls/identify' => 'jobs#identify_project'… |
|
|
|
|
|
match '/projects/:project_id/analyze' => 'analyze#index', :as =>… |
