admin_data 1.0.18 → 1.0.19

data/History.txt

@@ -1,4 +1,8 @@
 
+=== 2010-11-08 v1.0.19
+* used unscoped on the model to have basic search result always in the order user wants
+* remove inline css
+
 === 2010-11-08 v1.0.18
 * disable the columns not being used
 * use parseJSON instead of eval

data/README.md

@@ -1,15 +1,16 @@
+# admin_data #
 
 # This plugin works with both Rails 2.3.x and Rails 3.
-* master branch hosts code where admin_data is a plugin and it works with Rails 2.3.x .
-* rails3_gem branch hosts code where admin_data is a gem and it works with Rails 3.x . 
-
-[More info about Rails3](http://github.com/neerajdotname/admin_data/wiki/Installing-admin_data-in-a-Rails-3-project)
+* [Installing in Rails3 project](http://github.com/neerajdotname/admin_data/wiki/Installing-admin_data-in-a-Rails-3-project)
+* [Installing in Rails 2.3.x project](https://github.com/neerajdotname/admin_data/wiki/Installing-admin_data-in-a-Rails-2.3.x-project)
 
 ## [Live Demo](http://admin-data-test.heroku.com/admin_data)
 
 ## [Documentation](http://github.com/neerajdotname/admin_data/wiki)
 
-## [Source Code](http://github.com/neerajdotname/admin_data)
+## Source Code ##
+* admin_data works as a gem with Rails 3.x project. Source for that resides in master branch.
+* admin_data works as a plugin with Rails 2.3.x project. Source code for that resides in branch called [rails2](https://github.com/neerajdotname/admin_data/tree/rails2) .
 
 #Test#
 

data/app/controllers/admin_data/base_controller.rb

@@ -20,7 +20,7 @@ class AdminData::BaseController < ApplicationController
   end
 
   def ensure_is_allowed_to_view
-    render :text => '<h2>not authorized</h2>' unless admin_data_is_allowed_to_view?
+    render :text => 'not authorized' unless admin_data_is_allowed_to_view?
   end
 
   def ensure_is_allowed_to_view_klass
@@ -49,7 +49,7 @@ class AdminData::BaseController < ApplicationController
   end
 
   def build_klasses
-    # if is_allowed_to_view_klass option is passed then golbal constant can't be used since
+    # if is_allowed_to_view_klass option is passed then global constant can't be used since
     # list of klasses need to be built for each user. It will slow down the speed a bit since
     # every single the list needs to be built
     if AdminData::Config.setting[:is_allowed_to_view_klass]

data/app/controllers/admin_data/feed_controller.rb

@@ -9,6 +9,9 @@ class AdminData::FeedController < AdminData::BaseController
 
     begin
       @klass = AdminData::Util.camelize_constantize(params[:klasss])
+      @title = "Feeds from admin_data #{@klass.name}"
+      @description = "feeds from AdminData #{@klass.name}"
+      @records = @klass.find(:all, :order => "#{@klass.primary_key} desc", :limit => 100)
     rescue NameError => e
       render :text => "No constant was found with name #{params[:klasss]}" and return
     end

data/app/controllers/admin_data/main_controller.rb

@@ -117,7 +117,7 @@ class AdminData::MainController  < AdminData::BaseController
 
     @model = @klass.send('find', :first, :conditions => condition)
     unless @model
-      render :text => "<h2>#{@klass.name} not found: #{params[:id]}</h2>", :status => :not_found
+      render :text => "#{@klass.name} not found: #{params[:id]}", :status => :not_found
     end
   end
 

data/app/controllers/admin_data/search_controller.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__) , '..', '..', '..', 'lib', 'admin_data', 'search')
 
-class AdminData::SearchController  < AdminData::BaseController
+class AdminData::SearchController < AdminData::BaseController
 
   include Search
 
@@ -11,7 +11,7 @@ class AdminData::SearchController  < AdminData::BaseController
   before_filter :ensure_is_allowed_to_view_klass
   before_filter :ensure_valid_children_klass, :only => [:quick_search]
   before_filter :ensure_is_authorized_for_update_opration, :only => [:advance_search]
-  before_filter :set_collection_of_columns, :only => [:advance_search]
+  before_filter :set_column_type_info, :only => [:advance_search]
 
   def quick_search
     @page_title = "Search #{@klass.name.underscore}"
@@ -28,7 +28,7 @@ class AdminData::SearchController  < AdminData::BaseController
       params[:query] = params[:query].strip unless params[:query].blank?
       cond = build_quick_search_conditions(@klass, params[:query])
       h = { :page => params[:page], :per_page => per_page, :order => @order, :conditions => cond }
-      @records = @klass.paginate(h)
+      @records = @klass.unscoped.paginate(h)
     end
     respond_to {|format| format.html}
   end
@@ -46,8 +46,9 @@ class AdminData::SearchController  < AdminData::BaseController
       format.html { render }
       format.js {
 
-        if !hash[:errors].blank?
-          render :file =>  "#{plugin_dir}/app/views/admin_data/search/search/_errors.html.erb", :locals => {:errors => errors}
+        unless hash[:errors].blank?
+          file = "#{plugin_dir}/app/views/admin_data/search/search/_errors.html.erb"
+          render :file =>  file, :locals => {:errors => errors}
           return
         end
         if params[:admin_data_advance_search_action_type] == 'destroy'
@@ -61,7 +62,8 @@ class AdminData::SearchController  < AdminData::BaseController
         if @success_message
           render :json => {:success => @success_message }
         else
-          render :partial => "/admin_data/search/search/listing.html.erb", :locals => {:klass => @klass}, :layout => false
+          file = "/admin_data/search/search/listing.html.erb"
+          render :partial => file, :locals => {:klass => @klass}, :layout => false
         end
       }
     end
@@ -109,13 +111,13 @@ class AdminData::SearchController  < AdminData::BaseController
     params[:sortby] || "#{@klass.send(:table_name)}.#{@klass.send(:primary_key)} desc"
   end
 
-  def set_collection_of_columns
-    collection_of_columns = @klass.columns.collect { |column|
+  def set_column_type_info
+    column_type_info = @klass.columns.collect { |column|
       #JSLint complains if a hash has key named boolean. So I am changing the key to booleant
       column_type =  (column.type.to_s == 'boolean') ? 'booleant' : column.type.to_s
       %Q{ "#{column.name}":"#{column_type}" }
     }.join(',')
-    @collection_of_columns = "{#{collection_of_columns}}"
+    @column_type_info = "{#{column_type_info}}"
   end
 
 end

data/app/views/admin_data/feed/index.rss.builder

@@ -1,12 +1,12 @@
 xml.instruct! :xml, :version => "1.0"
 xml.rss(:version => "2.0" ){
   xml.channel{
-    xml.title("Feeds from admin_data #{@klass.name}")
+    xml.title(@title)
     xml.link(request.host_with_port)
-    xml.description("feeds from AdminData #{@klass.name}")
+    xml.description(@description)
     xml.language('en-us')
     h = {:order => "#{@klass.primary_key} desc", :limit => 100}
-    @klass.find(:all, h).each do |record|
+    @records.each do |record|
       xml.item do
         xml.title("#{@klasss} id: #{record.id}")
 

data/app/views/admin_data/main/association/_association_info.html.erb

@@ -1,7 +1,7 @@
 <div class="block rounded">
   <h3>Association Information</h3>
   <div class='content association_info'>
-    <% if AdminData::Util.admin_data_association_info_size(klass) %>
+    <% if AdminData::Util.association_info_size(klass) %>
       <%= render 'admin_data/main/association/belongs_to_info' ,  :klass => klass, :model => model %>
       <%= render 'admin_data/main/association/has_one_info',      :klass => klass, :model => model %>
       <%= render 'admin_data/main/association/has_many_info' ,    :klass => klass, :model => model %> 

data/app/views/admin_data/main/association/_belongs_to_info.html.erb

@@ -1,4 +1,4 @@
-<% if AdminData::Util.belongs_to_what(klass).size > 0 %>
+<% if AdminData::Util.belongs_to_what(klass).any? %>
   <p class='belongs_to'>
     <strong>belongs_to :</strong> 
     &nbsp;      

data/app/views/admin_data/main/association/_has_many_info.html.erb

@@ -1,4 +1,4 @@
-<% if AdminData::Util.has_many_what(klass).size > 0 %>
+<% if AdminData::Util.has_many_what(klass).any? %>
   <p>
     <strong>has_many :</strong>
     <%= admin_data_has_many_data(model, klass).html_safe %>

data/app/views/admin_data/main/association/_has_one_info.html.erb

@@ -1,4 +1,4 @@
-<% if AdminData::Util.has_one_what(klass).size > 0 %>
+<% if AdminData::Util.has_one_what(klass).any? %>
   <p>
     <strong>has_one :</strong> 
     <%= admin_data_has_one(model, klass).html_safe %>

data/app/views/admin_data/main/edit.html.erb

@@ -1,6 +1,6 @@
 <div id="main">
   <div>
-    <h1 style='float:left;font-weight:bold;font-size: 35px;'>
+    <h1 class='search_path'>
       <%= link_to @klass, admin_data_search_path(:klass => @klass.name) %>  
       >
       <%= link_to "ID #{@model.id}", ''%>  

data/app/views/admin_data/main/misc/_modify_record.html.erb

@@ -1,6 +1,4 @@
 <% if controller.send(:admin_data_is_allowed_to_update?) %>
-  <% @help = link_to('[?]','http://neerajdotname.github.com/admin_data/#deletevs-destroy') %>
-  
   <div class="block rounded">
     <h3>Modify Record</h3>
     <div style='padding-left:15px'>
@@ -10,12 +8,10 @@
       <p>
         <%= link_to 'Delete', del_admin_data_on_k_path(:klass => klass.name.underscore, :id => model) ,
                { :confirm => ' You are deleting (not destroying) a record. Are you sure?', :method => :delete} %> 
-        <%= @help %>      
       </p>
       <p>
         <%= link_to "Destroy", admin_data_on_k_path(:klass => klass.name.underscore, :id => model), 
               { :confirm => 'You are destroying a record. Are you sure?', :method => :delete} %>
-        <%= @help %>      
       </p>
     </div>
   </div>

data/app/views/admin_data/main/show.html.erb

@@ -1,7 +1,7 @@
 <div id="main">
 
   <div>
-    <h1 style='float:left;font-weight:bold;font-size: 35px;'>
+    <h1 class='search_path'>
       <%= link_to @klass, admin_data_search_path(:klass => @klass.name) %>  
       >
       <%= link_to "ID #{@model.id}", ''%>  

data/app/views/admin_data/search/_search_base.html.erb

@@ -1,8 +1,8 @@
 <div class="block" id="block-text">
 
   <div>
-    <h1 style='float:left;font-weight:bold;font-size: 35px;'> Listing <%=klass.name%></h1>
-    <h3 style='float:left;margin:22px 0 0 10px;color:gray;'><%=total_records_info(klass)%></h3>
+    <h1 class='listing_klass'> Listing <%=klass.name%></h1>
+    <h3 class='total_records_info_klass'><%=total_records_info(klass)%></h3>
     <div class='clear'></div>
   </div>
 

data/app/views/admin_data/search/search/_advance_search_form.html.erb

@@ -3,33 +3,42 @@
              :class => 'form search_form', 
              :id => 'advance_search_form') %>
 
-    <div id='advance_search' class='search_box'>
-     <table id='advance_search_table' class='advtable'>
-     </table>
+  <div id='advance_search' class='search_box'>
+    <table id='advance_search_table' class='advtable'>
+    </table>
 
-      <div class='sortby_umbrella'>
-        <div class='group' style='padding-left:20px;'>     
-          <div class='sortby_text' style='font-size:16px;'>Sort by</div>
-          <select name='sortby' id='sortby'>
-            <%= AdminData::Util.build_sort_options(klass,params[:sortby]).html_safe %>
-          </select>
-          <br />
-        </div> 
-        <div class='clear'></div>
-        <input type="submit" value="Search" class='submit_search' />
+    <div class='sortby_umbrella'>
+      <div class='group'>     
+        <div class='sortby_text'>Sort by</div>
+        <select name='sortby' id='sortby'>
+          <%= AdminData::Util.build_sort_options(klass,params[:sortby]).html_safe %>
+        </select>
+        <br />
       </div> 
-   </div>
+      <div class='clear'></div>
+      <input type="submit" value="Search" class='submit_search' />
+    </div> 
+  </div>
 
 </form>   
 
-<div style='display:none;' id='admin_data_table_structure_data'>
-  <%=@collection_of_columns%>
+<div style='display:none;' id='primary_column_type_info'>
+  <%=@column_type_info%>
+</div>
+<div style='display:none;' id='association_info'>
+  <%=@association_info%>
 </div>
 
 <style>
    .sortby_umbrella { 
       margin-top: 6px;
    }
+   .sortby_umbrella .group {
+      padding-left: 20px;
+   } 
+   .sortby_umbrella .sortby_text {
+      font-size: 16px;
+   } 
    .submit_search {
       margin-left: 15px;
       margin-right: 20px;

data/app/views/admin_data/search/search/_sortby.html.erb

@@ -4,15 +4,15 @@
 </select>
 
 <style>
-   .sortby_label { 
-      float: left;
-      vertical-align: bottom; 
-      margin-left: 40px;
-      width: 70px;
-   }
-   #sortyby {
-      width: 200px;
-      float: left;
-   }
+  .sortby_label { 
+    float: left;
+    vertical-align: bottom; 
+    margin-left: 40px;
+    width: 70px;
+  }
+  #sortyby {
+    width: 200px;
+    float: left;
+  }
 </style>   
 

data/app/views/admin_data/search/search/_title.html.erb

@@ -24,7 +24,7 @@
     float: left;
     margin-top: 5px; 
     padding-top: 5px; 
-   }
+  }
   .delete_destroy_box { 
     float: left;
     margin-top: 6px;

data/app/views/admin_data/shared/_header.html.erb

@@ -1,19 +1,20 @@
 <div id="header">
-    <h1> &nbsp;
-    </h1>  
+  <h1> &nbsp; </h1>  
 
-    <ul id='subnav'>
-      <li> 
-      <% label = "Back to Site " + image_tag('https://github.com/neerajdotname/admin_data/raw/rails3_gem/public/images/site.png', :width => '12') %>
-        <%= link_to label.html_safe, '/' %> 
-      </li>
-      <li> <%= link_to AdminData::Config.setting[:app_name] , admin_data_index_path %> </li>
-    </ul>
+  <ul id='subnav'>
+    <li> 
+      <% label = "Back to Site " + image_tag('https://github.com/neerajdotname/admin_data/raw/master/public/images/site.png', :width => '12') %>
+      <%= link_to label.html_safe, '/' %> 
+    </li>
+    <li> 
+      <%= link_to AdminData::Config.setting[:app_name] , admin_data_index_path %> 
+    </li>
+  </ul>
 
-    <div id='model_drop_down'>
-      <%= render '/admin_data/shared/drop_down_klasses', :drop_down_for_klasses => drop_down_for_klasses %>
-    </div>
+  <div id='model_drop_down'>
+    <%= render '/admin_data/shared/drop_down_klasses', :drop_down_for_klasses => drop_down_for_klasses %>
+  </div>
 
-    <div class='clear'></div>
+  <div class='clear'></div>
 
 </div>

data/lib/admin_data/util.rb

@@ -193,11 +193,8 @@ class AdminData::Util
     associations_for(klass, :has_and_belongs_to_many).map(&:name).map(&:to_s)
   end
 
-  def self.admin_data_association_info_size(klass)
-    (belongs_to_what(klass).size > 0)  ||
-    (has_many_what(klass).size > 0) ||
-    (has_one_what(klass).size > 0) ||
-    (habtm_what(klass).size > 0)
+  def self.association_info_size(k)
+    belongs_to_what(k).any? || has_many_what(k).any? || has_one_what(k).any? || habtm_what(k).any?
   end
 
   def self.string_representation_of_data(value)

data/lib/admin_data/version.rb

@@ -1,3 +1,3 @@
 module AdminData
-  VERSION = '1.0.18'
+  VERSION = '1.0.19'
 end

data/lib/css/base.css

@@ -1089,3 +1089,20 @@ ul#subnav li a:hover {
   font-weight: bold;
   font-size: 18px;
 }
+#main h2.search_path {
+  float:left;
+  font-weight:bold;
+  font-size: 35px;
+}
+
+.listing_klass {
+  float:left;
+  font-weight:bold;
+  font-size: 35px;
+}
+
+.total_records_info_klass {
+  float:left;
+  margin:22px 0 0 10px;
+  color:gray;
+}

data/lib/js/advance_search/advance_search.js

@@ -5,7 +5,7 @@ AdminData.advanceSearch = {
 	buildFirstRow: function() {
 
 		var img = $('<img />', {
-			src: 'https://github.com/neerajdotname/admin_data/raw/rails3_gem/public/images/add.png'
+			src: 'https://github.com/neerajdotname/admin_data/raw/master/public/images/add.png'
 		});
 
 		$('#advance_search_table').append(this.buildRow())
@@ -42,7 +42,7 @@ AdminData.advanceSearch = {
 
 	buildCol4: function() {
 		var img = $('<img />', {
-			src: 'https://github.com/neerajdotname/admin_data/raw/rails3_gem/public/images/no.png'
+			src: 'https://github.com/neerajdotname/admin_data/raw/master/public/images/no.png'
 		});
 
 		return $('<td />').append($('<a />', {
@@ -63,7 +63,7 @@ AdminData.advanceSearch = {
 			currentRowNumber = 1;
 			$(document).data('currentRowNumber', currentRowNumber);
 		} else {
-			currentRowNumber = parseInt(currentRowNumber) + 1;
+			currentRowNumber = parseInt(currentRowNumber, 10) + 1;
 			$(document).data('currentRowNumber', currentRowNumber);
 		}
 

data/lib/js/advance_search/build_first_row.js

@@ -1,6 +1,6 @@
 $(function() {
 
-  var json = $.parseJSON( $('#admin_data_table_structure_data').html());
+  var json = $.parseJSON( $('#primary_column_type_info').html());
 	$('#advance_search_table').data('table_structure', json);
 	AdminData.advanceSearch.buildFirstRow();
 

data/lib/js/misc/js_util.js

@@ -1,5 +1,10 @@
 var AdminData = AdminData || {};
 
+/**
+ * A general Utility
+ * @namespace AdminData
+ * @class jsUtil
+ */
 AdminData.jsUtil = {
 
   // TODO since advance search was not working with util confirm , window.confirm is used directly
@@ -21,7 +26,12 @@ AdminData.jsUtil = {
 		$('.colorize tr:even').addClass('even');
 	},
 
-	// returns date in string format. example: 07-September-2009  
+  /**
+   * Returns the input date in string format.
+   *
+   * @param {date} input date 
+   * @return {string} The string value of input date
+   */
 	dateToString: function(date) {
 		var month = (date.getMonth() + 1).toString();
 		var day = date.getDate().toString();
@@ -31,6 +41,12 @@ AdminData.jsUtil = {
 		return day + "-" + months[month - 1] + "-" + date.getFullYear();
 	},
 
+  /**
+   * Generate a random number between 1 and 10000000
+   *
+   * @return {Integer} a random Integer
+   *
+   */
 	randomNumber: function() {
 		var maxVal = 100000000,
 		minVal = 1;

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: admin_data
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: false
   segments: 
   - 1
   - 0
-  - 18
-  version: 1.0.18
+  - 19
+  version: 1.0.19
 platform: ruby
 authors: 
 - Neeraj Singh
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-08 00:00:00 -05:00
+date: 2010-11-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency