Merge branch 'drop_rjs_2' of /home/git/repositories/gitlab/gitlabhq

Dmitriy Zaporozhets
2 parents ff25cb93 da10cad1
Showing 9 changed files with 43 additions and 27 deletions Show diff stats
app/assets/javascripts/issues.js.coffee
app/assets/javascripts/notes.js
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
app/views/projects/notes/index.js.haml
config/initializers/1_settings.rb
@@ -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")
@@ -6,7 +6,7 @@ var NoteList = {
   target_type: null,
   init: function(tid, tt, path) {
-    NoteList.notes_path = path + ".js";
+    NoteList.notes_path = path + ".json";
     NoteList.target_id = tid;
     NoteList.target_type = tt;
     NoteList.target_params = "target_type=" + NoteList.target_type + "&target_id=" + NoteList.target_id;
@@ -411,7 +411,10 @@ var NoteList = {
       data: NoteList.target_params,
       complete: function(){ $('.js-notes-busy').removeClass("loading")},
       beforeSend: function() { $('.js-notes-busy').addClass("loading") },
-      dataType: "script"
+      success: function(data) {
+        NoteList.setContent(data.html);
+      },
+      dataType: "json"
     });
   },
@@ -419,7 +422,7 @@ var NoteList = {
    * Called in response to getContent().
    * Replaces the content of #notes-list with the given html.
    */
-  setContent: function(newNoteIds, html) {
+  setContent: function(html) {
     $("#notes-list").html(html);
   },
@@ -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
@@ -14,7 +14,14 @@ class Projects::NotesController &lt; Projects::ApplicationController
       @discussions   = discussions_from_notes
     end
-    respond_with(@notes)
+    respond_to do |format|
+      format.html { redirect_to :back }
+      format.json do
+        render json: {
+          html: view_to_html_string("projects/notes/_notes")
+        }
+      end
+    end
   end
   def create
@@ -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();
@@ -1,4 +0,0 @@
-- unless @notes.blank?
-  var notesHtml = "#{escape_javascript(render 'projects/notes/notes')}";
-  - new_note_ids = @notes.map(&:id)
-  NoteList.setContent(#{new_note_ids}, notesHtml);
@@ -30,7 +30,7 @@ class Settings &lt; Settingslogic
         gitlab.relative_url_root
       ].join('')
     end
-    
+
     # check that values in `current` (string or integer) is a contant in `modul`.
     def verify_constant_array(modul, current, default)
       values = default || []
	@@ -188,4 +188,12 @@ class ApplicationController < ActionController::Base		@@ -188,4 +188,12 @@ class ApplicationController < ActionController::Base
188	count: count	188	count: count
189	}	189	}
190	end	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	end	199	end
	@@ -14,7 +14,14 @@ class Projects::NotesController < Projects::ApplicationController		@@ -14,7 +14,14 @@ class Projects::NotesController < Projects::ApplicationController
14	@discussions = discussions_from_notes	14	@discussions = discussions_from_notes
15	end	15	end
16		16
17	- respond_with(@notes)	17	+ respond_to do \|format\|
		18	+ format.html { redirect_to :back }
		19	+ format.json do
		20	+ render json: {
		21	+ html: view_to_html_string("projects/notes/_notes")
		22	+ }
		23	+ end
		24	+ end
18	end	25	end
19		26
20	def create	27	def create
	@@ -1,4 +0,0 @@	@@ -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();
	@@ -1,4 +0,0 @@	@@ -1,4 +0,0 @@
1	-- unless @notes.blank?
2	- var notesHtml = "#{escape_javascript(render 'projects/notes/notes')}";
3	- - new_note_ids = @notes.map(&:id)
4	- NoteList.setContent(#{new_note_ids}, notesHtml);
	@@ -30,7 +30,7 @@ class Settings < Settingslogic		@@ -30,7 +30,7 @@ class Settings < Settingslogic
30	gitlab.relative_url_root	30	gitlab.relative_url_root
31	].join('')	31	].join('')
32	end	32	end
33	-	33	+
34	# check that values in `current` (string or integer) is a contant in `modul`.	34	# check that values in `current` (string or integer) is a contant in `modul`.
35	def verify_constant_array(modul, current, default)	35	def verify_constant_array(modul, current, default)
36	values = default \|\| []	36	values = default \|\| []