removes puts, fixes flags moderation error

Author: ndomar

app/controllers/rails_admin/main_controller.rb

@@ -112,6 +112,16 @@ def redirect_to_on_success
         obj = @objects[session["index"]]
         @object.moderate= true 
         redirect_to edit_path(:id => obj.id, :return_to => params[:return_to]), :flash => { :success => notice }
+      elsif params[:_valid_another]
+        @objects ||= list_entries(true)
+        obj = @objects[session["index"]]
+        @object.resolve true 
+        redirect_to edit_path(:id => obj.id, :return_to => params[:return_to]), :flash => { :success => notice }
+       elsif params[:_invalid_another]
+        @objects ||= list_entries(true)
+        obj = @objects[session["index"]]
+        @object.resolve false 
+        redirect_to edit_path(:id => obj.id, :return_to => params[:return_to]), :flash => { :success => notice } 
       else
         redirect_to back_or_index, :flash => { :success => notice }
       end
@@ -160,9 +170,6 @@ def check_for_cancel
     end
 
     def get_collection(is_edit, model_config, scope, pagination)
-      puts "**" * 20
-      puts "parameters"
-      puts params[:f]
       or_filters = Hash.new
       if params[:f] != nil
       params[:f].each  do |param|

app/views/rails_admin/main/_submit_buttons.html.haml

@@ -9,12 +9,19 @@
     - if authorized? :new, @abstract_model
       %button.btn.btn-info{:type => "submit", :name => "_add_another", :'data-disable-with' => t("admin.form.save_and_add_another")}
         = t("admin.form.save_and_add_another")
-    - if authorized? :new, @abstract_model
+    - if ((authorized? :new, @abstract_model) && (@abstract_model.pretty_name != "Flag"))
       %button.btn.btn-info{:type => "submit", :name => "_moderate_another", :'data-disable-with' => t("admin.form.save_and_add_another")}
         = t("admin.form.moderate_and_moderate_another")
+    - if ((authorized? :new, @abstract_model) && (@abstract_model.pretty_name == "Flag"))
+      %button.btn.btn-info{:type => "submit", :name => "_valid_another", :'data-disable-with' => t("admin.form.save_and_add_another")}
+        = "Mark invalid and moderate another"
+    - if ((authorized? :new, @abstract_model) && (@abstract_model.pretty_name == "Flag"))
+      %button.btn.btn-info{:type => "submit", :name => "_invalid_another", :'data-disable-with' => t("admin.form.save_and_add_another")}
+        = "Mark valid and moderate another"
     - if authorized? :edit, @abstract_model
       %button.btn.btn-info{:type => "submit", :name => "_moderate_another", :'data-disable-with' => t("admin.form.save_and_edit")}
         = t("admin.form.save_and_edit")
     %button.btn{:type => "submit", :name => "_continue", :'data-disable-with' => t("admin.form.cancel")}
       %i.icon-remove
       = t("admin.form.cancel")
+=@abstract_model.pretty_name

lib/rails_admin/adapters/mongoid.rb

@@ -44,12 +44,8 @@ def all(options = {},scope=nil)
         fi = Hash.new
         fi["$gte"] = 3 
         sc["popularity"] = fi 
-         #scope = scope.where(query_conditions(options[:query])) if options[:query]
-        #scope = scope.where() if options[:filters]
-                  puts "--" * 20
 
          y =  filter_conditions(options[:filters]) if options[:filters]
-         puts y
          mappings = {"created_on" => "created_at"}
          if options[:filters]
            if(y["$and"])
@@ -76,22 +72,16 @@ def all(options = {},scope=nil)
           if options[:filters]
             x["$and"] = ze if !ze.empty?
           end
-          puts x
           or_filters = options[:or_filters]
-          puts "or filters"
-          puts or_filters
           or_hash = Hash.new
           or_conditions = Array.new
          second_filter = Hash.new
          second_filter["$and"] = Array.new
          if or_filters != nil
           i = 0
           or_filters.each do |o|
-            puts o
             o[0] = o[0][3,o[0].length]
             condition = filter_conditions({o[0] => or_filters["OR " + o[0]]})
-            puts "CONDITION"
-            puts condition
             condition["$and"].each do |c|
               second_filter["$and"][i] = c
               i = i + 1
@@ -100,10 +90,7 @@ def all(options = {},scope=nil)
             #or_hash["$or"][i] = condition["$and"][0]
           end
          end
-         puts "first filter"
-         puts x
-         puts "second filter"
-         puts second_filter
+
          full_filter = Array.new
          if x != nil
           full_filter[0] = x if x["$and"] != [] && options[:filters]
@@ -113,7 +100,6 @@ def all(options = {},scope=nil)
        end
          final = Hash.new
          final["$or"] = full_filter
-         puts final
           scope = scope.where(final) if final["$or"] != []
           if options[:page] && options[:per]
             scope = scope.send(Kaminari.config.page_method_name, options[:page]).per(options[:per])

lib/rails_admin/config/actions/edit.rb

@@ -35,19 +35,23 @@ class Edit < RailsAdmin::Config::Actions::Base
               @authorization_adapter && @authorization_adapter.attributes_for(:update, @abstract_model).each do |name, value|
                 @object.send("#{name}=", value)
               end
-
-              if @object.save
-                @auditing_adapter && @auditing_adapter.update_object(@abstract_model, @object, @cached_assocations_hash, associations_hash, @modified_assoc, @old_object, _current_user)
-                respond_to do |format|
-                  format.html { redirect_to_on_success }
-                  format.js { render :json => { :id => @object.id, :label => @model_config.with(:object => @object).object_label } }
+              if !(params[:_invalid_another] || params[:_valid_another]) 
+                if @object.save
+                  @auditing_adapter && @auditing_adapter.update_object(@abstract_model, @object, @cached_assocations_hash, associations_hash, @modified_assoc, @old_object, _current_user)
+                  respond_to do |format|
+                    format.html { redirect_to_on_success }
+                    format.js { render :json => { :id => @object.id, :label => @model_config.with(:object => @object).object_label } }
+                  end
+                else
+                  handle_save_error :edit
                 end
               else
-                handle_save_error :edit
+                respond_to do |format|
+                    format.html { redirect_to_on_success }
+                    format.js { render :json => { :id => @object.id, :label => @model_config.with(:object => @object).object_label } }
+                  end 
               end
-
             end
-
           end
         end
 

lib/rails_admin/config/actions/merge_items.rb

@@ -25,8 +25,6 @@ class MergeItems < RailsAdmin::Config::Actions::Base
               render @action.template_name
 
             elsif request.delete? # BULK DESTROY
-              puts "##" * 20
-              puts "merge"
 
                 merge(@objects[0],@objects[1],{safe: false}) if params[:master] == @objects[0].to_s
                 merge(@objects[1],@objects[0], {safe: false}) unless params[:master] == @objects[0].to_s

lib/rails_admin/config/has_fields.rb

@@ -115,38 +115,29 @@ def visible_fields
       end
 
       def extract_specs
-        puts "**" * 10
-        puts "EXTRACTING SPECS"
         fields = visible_fields
         specs = Array.new
         fields.each do |f|
-          puts f.name.to_s
           splitted_specs = f.name.to_s.split("\/")
           specs << splitted_specs[0] if ((splitted_specs.count > 1) && (!specs.include? splitted_specs[0]))
         end
-        puts specs.count
         specs
       end
 
 
       def spec_fields spec
         i = 0
-        puts "*" * 200
-        puts "SPEC FIELDS"
         specs = Array.new
         fields = all_fields.map {|f| f.with(bindings) }.select(&:visible?).sort_by{|f| [f.order, i += 1] } # stable sort, damn
         fields.each do |f|
           splitted_specs = f.name.to_s.split("\/")
           specs << f if splitted_specs[0].to_s == spec.to_s
-          puts splitted_specs[1]
         end
         specs
       end
 
       def new_fields
         i = 0
-        puts "*" * 200
-        puts "NEW FIELDS"
         fields = all_fields.map {|f| f.with(bindings) }.select(&:visible?).sort_by{|f| [f.order, i += 1] } # stable sort, damn
       end