admin_data 1.0.17 → 1.0.18

data/History.txt

@@ -1,4 +1,9 @@
 
+=== 2010-11-08 v1.0.18
+* disable the columns not being used
+* use parseJSON instead of eval
+* javascript variable declaration refactoring
+
 === 2010-10-12 v1.0.17
 * use image for advance search add and remove link
 * fix bug regarding "Destroy All"

data/README.md

@@ -1,25 +1,21 @@
-# admin_data works with rails3. [More information is available here](http://github.com/neerajdotname/admin_data/wiki/Installing-admin_data-in-a-Rails-3-project)#
 
-#Live Demo#
+# 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 . 
 
-[http://demo.neeraj.name/admin_data](http://demo.neeraj.name/admin_data)
+[More info about Rails3](http://github.com/neerajdotname/admin_data/wiki/Installing-admin_data-in-a-Rails-3-project)
 
-#Documentation#
+## [Live Demo](http://admin-data-test.heroku.com/admin_data)
 
-[http://github.com/neerajdotname/admin_data/wiki](http://github.com/neerajdotname/admin_data/wiki)
+## [Documentation](http://github.com/neerajdotname/admin_data/wiki)
 
-#JavaScript Unit tests live result#
-
-[http://demo.neeraj.name/admin_data/jstest](http://demo.neeraj.name/admin_data/jstest)
-
-#Source code#
-
-[http://github.com/neerajdotname/admin_data](http://github.com/neerajdotname/admin_data)
+## [Source Code](http://github.com/neerajdotname/admin_data)
 
 #Test#
 
 Test code currently resides in a different project [admin_data_test](http://github.com/neerajdotname/admin_data_test) . Test code should be merged into this project very soon.
 
-#License#
+
+### License
 
 Dual licensed under the [MIT](http://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt) and [GPL version 2](http://github.com/jquery/jquery/blob/master/GPL-LICENSE.txt) licenses.

data/app/controllers/admin_data/search_controller.rb

@@ -110,13 +110,12 @@ class AdminData::SearchController  < AdminData::BaseController
   end
 
   def set_collection_of_columns
-    collection_of_colums = @klass.columns.collect { |column|
+    collection_of_columns = @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
-      "#{column.name}:'#{column_type}'"
-    }
-    collection_of_colums = collection_of_colums.join(',')
-    @collection_of_colums = "[{#{collection_of_colums}}]"
+      %Q{ "#{column.name}":"#{column_type}" }
+    }.join(',')
+    @collection_of_columns = "{#{collection_of_columns}}"
   end
 
 end

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

@@ -23,7 +23,7 @@
 </form>   
 
 <div style='display:none;' id='admin_data_table_structure_data'>
-  <%=@collection_of_colums%>
+  <%=@collection_of_columns%>
 </div>
 
 <style>

data/lib/admin_data/version.rb

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

data/lib/js/advance_search/act_on_result.js

@@ -43,4 +43,3 @@ $('#advance_search_destroy_all').live('click', function() {
 	}
 	return false;
 });
-

data/lib/js/advance_search/advance_search.js

@@ -8,13 +8,17 @@ AdminData.advanceSearch = {
 			src: 'https://github.com/neerajdotname/admin_data/raw/rails3_gem/public/images/add.png'
 		});
 
-		$('#advance_search_table').append(this.buildRow()).find('tr td:last a').attr('id','add_row_link_1').removeClass('remove_row').addClass('add_row_link').html('').append(img);
+		$('#advance_search_table').append(this.buildRow())
+                                .find('tr td:last a')
+                                .attr('id','add_row_link_1')
+                                .removeClass('remove_row')
+                                .addClass('add_row_link')
+                                .html('')
+                                .append(img);
 	},
 
 	buildCol1: function() {
-		var i, col = $('<select />', {
-			className: 'col1'
-		}).append($('<option />')),
+		var i, col = $('<select />', { className: 'col1' }).append($('<option />')),
 		tableStructure = $('#advance_search_table').data('table_structure');
 
 		for (i in tableStructure) {
@@ -27,16 +31,13 @@ AdminData.advanceSearch = {
 	},
 
 	buildCol2: function() {
-		var select = $('<select />', {
-			className: 'col2'
-		});
+		var select = $('<select />', { className: 'col2', disabled: 'disabled' });
 		return $('<td />').append(select);
 	},
 
 	buildCol3: function() {
-		return $('<td />').append($('<input />', {
-			className: 'col3'
-		}));
+		var select = $('<input />', { className: 'col3' });
+		return $('<td />').append($('<input />', { className: 'col3', disabled: 'disabled' }));
 	},
 
 	buildCol4: function() {
@@ -60,25 +61,19 @@ AdminData.advanceSearch = {
 
 		if (currentRowNumber === undefined) {
 			currentRowNumber = 1;
-			$(document).data('currentRowNumber', currentRowNumber)
+			$(document).data('currentRowNumber', currentRowNumber);
 		} else {
 			currentRowNumber = parseInt(currentRowNumber) + 1;
-			$(document).data('currentRowNumber', currentRowNumber)
+			$(document).data('currentRowNumber', currentRowNumber);
 		}
 
 		$.each(build_array, function(index, value) {
 			$tr.append(that[value]());
 		});
 
-		$tr.find('select.col1').attr({
-			name: 'adv_search[' + currentRowNumber + '_row][col1]'
-		});
-		$tr.find('select.col2').attr({
-			name: 'adv_search[' + currentRowNumber + '_row][col2]'
-		});
-		$tr.find('input.col3').attr({
-			name: 'adv_search[' + currentRowNumber + '_row][col3]'
-		});
+		$tr.find('select.col1').attr({ name: 'adv_search[' + currentRowNumber + '_row][col1]' });
+		$tr.find('select.col2').attr({ name: 'adv_search[' + currentRowNumber + '_row][col2]' });
+		$tr.find('input.col3').attr({ name: 'adv_search[' + currentRowNumber + '_row][col3]' });
 
     $tr.find('.remove_row').attr('id', 'remove_row_'+currentRowNumber);
 
@@ -86,4 +81,3 @@ AdminData.advanceSearch = {
 	}
 
 };
-

data/lib/js/advance_search/build_first_row.js

@@ -1,11 +1,7 @@
 $(function() {
 
-	//TODO use $.parseJSON also use live method of jQuery 1.4.1
-	var table_structure_data_non_json = $('#admin_data_table_structure_data').html(),
-	table_structure_data_json = eval(table_structure_data_non_json);
-
-	$('#advance_search_table').data('table_structure', table_structure_data_json[0]);
-
+  var json = $.parseJSON( $('#admin_data_table_structure_data').html());
+	$('#advance_search_table').data('table_structure', json);
 	AdminData.advanceSearch.buildFirstRow();
 
 });

data/lib/js/advance_search/event_bindings.js

@@ -1,31 +1,26 @@
 var AdminData = AdminData || {};
 
 AdminData.bindings = {
+
 	col2_change: function(e) {
 		var arrayList = ['is_false', 'is_true', 'is_null', 'is_not_null'],
 		$col2 = $(e.target).closest('select'),
 		value = $col2.val(),
 		tableStructure = $('#advance_search_table').data('table_structure'),
-		columnType = tableStructure[$col2.val()],
-		col1ColumnType;
-
-		$col3 = $col2.parents('tr').find('td input.col3');
-		$col1 = $col2.parents('tr').find('td select.col1');
+		$col3 = $col2.parents('tr').find('td input.col3'),
+		$col1 = $col2.parents('tr').find('td select.col1'),
 		col1ColumnType = tableStructure[$col1.val()];
 
+
 		if (value.length === 0 || ($.inArray(value, arrayList) > - 1)) {
-			 $col3.val('');
+			 $col3.val('').attr('disabled','disabled');
 
 		} else {
-
+      $col3.removeAttr('disabled');
 			if (col1ColumnType === 'datetime' || col1ColumnType === 'date') {
 				$col3.val(AdminData.jsUtil.dateToString(new Date())).addClass('datepicker');
 				
-        $('.datepicker').datepicker({
-					dateFormat: 'dd-MM-yy',
-					changeYear: true,
-					changeMonth: true
-				});
+        $('.datepicker').datepicker({ dateFormat: 'dd-MM-yy', changeYear: true, changeMonth: true });
 
 			} else {
 				$('.datepicker').datepicker('destroy');
@@ -53,7 +48,7 @@ AdminData.bindings = {
 
 		col2.html('');
 		AdminData.jsUtil.buildOptionsFromArray(options, col2);
-		col2.trigger('change');
+		col2.trigger('change').removeAttr('disabled');
 	}
 };
 
@@ -79,4 +74,3 @@ $('#advance_search_table select.col1').live('change', function(e) {
 $('#advance_search_table select.col2').live('change', function(e) {
 	AdminData.bindings.col2_change(e);
 });
-

metadata

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