removed project filter
This commit is contained in:
parent
cff9519127
commit
321dbb7bac
5 changed files with 26 additions and 64 deletions
|
@ -7,19 +7,6 @@ var ProjectsList = {
|
|||
this.limit=limit;
|
||||
this.offset=limit;
|
||||
this.initLoadMore();
|
||||
|
||||
$('.project_search').keyup(function() {
|
||||
var terms = $(this).val();
|
||||
if (terms.length >= 2 || terms.length == 0) {
|
||||
url = $('.project_search').parent().attr('action');
|
||||
$.ajax({
|
||||
type: "GET",
|
||||
url: location.href,
|
||||
data: { 'terms': terms, 'replace': true },
|
||||
dataType: "script"
|
||||
});
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
getOld:
|
||||
|
@ -33,17 +20,6 @@ var ProjectsList = {
|
|||
dataType: "script"});
|
||||
},
|
||||
|
||||
replace:
|
||||
function(count, html) {
|
||||
$(".tile").html(html);
|
||||
if(count == ProjectsList.limit) {
|
||||
this.offset = count;
|
||||
this.initLoadMore();
|
||||
} else {
|
||||
this.offset = 0;
|
||||
}
|
||||
},
|
||||
|
||||
append:
|
||||
function(count, html) {
|
||||
$(".tile").append(html);
|
||||
|
|
|
@ -647,9 +647,3 @@ h4.middle-panel {
|
|||
border-radius:3px;
|
||||
float:left;
|
||||
}
|
||||
|
||||
.project_search {
|
||||
margin: 1.5em 0;
|
||||
padding: 8px !important;
|
||||
width: 300px;
|
||||
}
|
||||
|
|
|
@ -12,9 +12,7 @@ class ProjectsController < ApplicationController
|
|||
|
||||
def index
|
||||
@limit, @offset = (params[:limit] || 16), (params[:offset] || 0)
|
||||
@projects = current_user.projects
|
||||
@projects = @projects.where("name LIKE ?", "%#{params[:terms]}%") unless params[:terms].blank?
|
||||
@projects = @projects.limit(@limit).offset(@offset)
|
||||
@projects = current_user.projects.limit(@limit).offset(@offset)
|
||||
end
|
||||
|
||||
def new
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
- content_for(:body_class, "projects-page")
|
||||
- content_for(:page_title) do
|
||||
.container_4
|
||||
.grid_4
|
||||
- if current_user.can_create_project?
|
||||
|
@ -7,19 +6,19 @@
|
|||
%h2.icon
|
||||
%span
|
||||
Projects
|
||||
%center
|
||||
= form_tag projects_path, :method => :get, :remote => true, :id => "projects_search_form" do
|
||||
= search_field_tag :project_search, nil, { :placeholder => 'Filter projects by name', :class => 'project_search text' }
|
||||
|
||||
%div.clear
|
||||
- unless @projects.empty?
|
||||
%div{:class => "tile"}
|
||||
= render "tile"
|
||||
|
||||
-# If projects requris paging
|
||||
-# We add ajax loader & init script
|
||||
- if @projects.count == @limit
|
||||
.clear
|
||||
.loading{ :style => "display:none;"}
|
||||
%center= image_tag "ajax-loader.gif"
|
||||
|
||||
- if @projects.count == @limit
|
||||
:javascript
|
||||
$(function(){
|
||||
ProjectsList.init(16);
|
||||
|
|
|
@ -1,7 +1,2 @@
|
|||
- if params[:replace]
|
||||
:plain
|
||||
ProjectsList.replace(#{@projects.count}, "#{escape_javascript(render(:partial => 'projects/tile'))}");
|
||||
- else
|
||||
:plain
|
||||
ProjectsList.append(#{@projects.count}, "#{escape_javascript(render(:partial => 'projects/tile'))}");
|
||||
|
||||
|
|
Loading…
Reference in a new issue