Drop rjs from Issues#index

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Drop rjs from Issues#index
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets
1 parent 596e64e5
Showing 6 changed files with 29 additions and 25 deletions Show diff stats
app/assets/javascripts/issues.js.coffee
app/controllers/application_controller.rb
app/controllers/projects/issues_controller.rb
app/controllers/projects/notes_controller.rb
app/views/projects/issues/_head.html.haml
app/views/projects/issues/index.js.haml
@@ -22,7 +22,7 @@
           backgroundColor: '#DDD'
           opacity: .4
       )
-  
+
   reload: ->
     Issues.initSelects()
     Issues.initChecks()
@@ -54,7 +54,16 @@
       unless terms is last_terms
         last_terms = terms
         if terms.length >= 2 or terms.length is 0
-          form.submit()
+          $.ajax
+            type: "GET"
+            url: location.href
+            data: "issue_search=" + terms
+            complete: ->
+              $(".loading").hide()
+            success: (data) ->
+              $('.issues-holder').html(data.html)
+              Issues.reload()
+            dataType: "json"
  
   checkChanged: ->
     checked_issues = $(".selected_issue:checked")
@@ -188,4 +188,12 @@ class ApplicationController &lt; ActionController::Base
       count: count
     }
   end
+
+  def view_to_html_string(partial)
+    render_to_string(
+      partial,
+      layout: false,
+      formats: [:html]
+    )
+  end
 end
@@ -11,7 +11,7 @@ class Projects::IssuesController &lt; Projects::ApplicationController
   # Allow modify issue
   before_filter :authorize_modify_issue!, only: [:edit, :update]
  
-  respond_to :js, :html
+  respond_to :html
  
   def index
     terms = params['issue_search']
@@ -28,9 +28,13 @@ class Projects::IssuesController &lt; Projects::ApplicationController
  
  
     respond_to do |format|
-      format.html # index.html.erb
-      format.js
+      format.html
       format.atom { render layout: false }
+      format.json do
+        render json: {
+          html: view_to_html_string("projects/issues/_issues")
+        }
+      end
     end
   end
  
@@ -48,10 +52,7 @@ class Projects::IssuesController &lt; Projects::ApplicationController
     @target_type = :issue
     @target_id = @issue.id
  
-    respond_to do |format|
-      format.html
-      format.js
-    end
+    respond_with(@issue)
   end
  
   def create
@@ -17,14 +17,8 @@ class Projects::NotesController &lt; Projects::ApplicationController
     respond_to do |format|
       format.html { redirect_to :back }
       format.json do
-        html = render_to_string(
-          "projects/notes/_notes",
-          layout: false,
-          formats: [:html]
-        )
-
         render json: {
-          html: html,
+          html: view_to_html_string("projects/notes/_notes")
         }
       end
     end
@@ -21,9 +21,5 @@
           = link_to new_project_issue_path(@project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "btn btn-new pull-right", title: "New Issue", id: "new_issue_link" do
             %i.icon-plus
             New Issue
-        = form_tag project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: 'pull-right issue-search-form'  do
-          = hidden_field_tag :status, params[:status], id: 'search_status'
-          = hidden_field_tag :assignee_id, params[:assignee_id], id: 'search_assignee_id'
-          = hidden_field_tag :milestone_id, params[:milestone_id], id: 'search_milestone_id'
-          = hidden_field_tag :label_name, params[:label_name], id: 'search_label_name'
+        = form_tag project_issues_path(@project), method: :get, id: "issue_search_form", class: 'pull-right issue-search-form'  do
           = search_field_tag :issue_search, nil, { placeholder: 'Filter by title or description', class: 'input-xpadding issue_search input-xlarge append-right-10 search-text-input' }
@@ -1,4 +0,0 @@
-:plain
-  $('.issues-holder').html("#{escape_javascript(render('issues'))}");
-  History.replaceState({path: "#{request.url}"}, document.title, "#{request.url}");
-  Issues.reload();
...	...	@@ -22,7 +22,7 @@
22	22	backgroundColor: '#DDD'
23	23	opacity: .4
24	24	)
25		-
	25	+
26	26	reload: ->
27	27	Issues.initSelects()
28	28	Issues.initChecks()
...	...	@@ -54,7 +54,16 @@
54	54	unless terms is last_terms
55	55	last_terms = terms
56	56	if terms.length >= 2 or terms.length is 0
57		- form.submit()
	57	+ $.ajax
	58	+ type: "GET"
	59	+ url: location.href
	60	+ data: "issue_search=" + terms
	61	+ complete: ->
	62	+ $(".loading").hide()
	63	+ success: (data) ->
	64	+ $('.issues-holder').html(data.html)
	65	+ Issues.reload()
	66	+ dataType: "json"
58	67
59	68	checkChanged: ->
60	69	checked_issues = $(".selected_issue:checked")
...	...
...	...	@@ -188,4 +188,12 @@ class ApplicationController < ActionController::Base
188	188	count: count
189	189	}
190	190	end
	191	+
	192	+ def view_to_html_string(partial)
	193	+ render_to_string(
	194	+ partial,
	195	+ layout: false,
	196	+ formats: [:html]
	197	+ )
	198	+ end
191	199	end
...	...
...	...	@@ -11,7 +11,7 @@ class Projects::IssuesController < Projects::ApplicationController
11	11	# Allow modify issue
12	12	before_filter :authorize_modify_issue!, only: [:edit, :update]
13	13
14		- respond_to :js, :html
	14	+ respond_to :html
15	15
16	16	def index
17	17	terms = params['issue_search']
...	...	@@ -28,9 +28,13 @@ class Projects::IssuesController < Projects::ApplicationController
28	28
29	29
30	30	respond_to do \|format\|
31		- format.html # index.html.erb
32		- format.js
	31	+ format.html
33	32	format.atom { render layout: false }
	33	+ format.json do
	34	+ render json: {
	35	+ html: view_to_html_string("projects/issues/_issues")
	36	+ }
	37	+ end
34	38	end
35	39	end
36	40
...	...	@@ -48,10 +52,7 @@ class Projects::IssuesController < Projects::ApplicationController
48	52	@target_type = :issue
49	53	@target_id = @issue.id
50	54
51		- respond_to do \|format\|
52		- format.html
53		- format.js
54		- end
	55	+ respond_with(@issue)
55	56	end
56	57
57	58	def create
...	...
...	...	@@ -17,14 +17,8 @@ class Projects::NotesController < Projects::ApplicationController
17	17	respond_to do \|format\|
18	18	format.html { redirect_to :back }
19	19	format.json do
20		- html = render_to_string(
21		- "projects/notes/_notes",
22		- layout: false,
23		- formats: [:html]
24		- )
25		-
26	20	render json: {
27		- html: html,
	21	+ html: view_to_html_string("projects/notes/_notes")
28	22	}
29	23	end
30	24	end
...	...
...	...	@@ -21,9 +21,5 @@
21	21	= link_to new_project_issue_path(@project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "btn btn-new pull-right", title: "New Issue", id: "new_issue_link" do
22	22	%i.icon-plus
23	23	New Issue
24		- = form_tag project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: 'pull-right issue-search-form' do
25		- = hidden_field_tag :status, params[:status], id: 'search_status'
26		- = hidden_field_tag :assignee_id, params[:assignee_id], id: 'search_assignee_id'
27		- = hidden_field_tag :milestone_id, params[:milestone_id], id: 'search_milestone_id'
28		- = hidden_field_tag :label_name, params[:label_name], id: 'search_label_name'
	24	+ = form_tag project_issues_path(@project), method: :get, id: "issue_search_form", class: 'pull-right issue-search-form' do
29	25	= search_field_tag :issue_search, nil, { placeholder: 'Filter by title or description', class: 'input-xpadding issue_search input-xlarge append-right-10 search-text-input' }
...	...
...	...	@@ -1,4 +0,0 @@
1		-:plain
2		- $('.issues-holder').html("#{escape_javascript(render('issues'))}");
3		- History.replaceState({path: "#{request.url}"}, document.title, "#{request.url}");
4		- Issues.reload();