Merge branch 'master' into 1.1

yfactorial · Apr 2, 2009 · c89b29c · c89b29c
2 parents f3ee03e + 627b66d
commit c89b29c
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,7 +16,4 @@ sample_rails_app/log/*.log
 sample_rails_app/tmp/**/*
 sample_rails_app/doc/api
 sample_rails_app/doc/app
-sample_rails_app/db/*.sqlite3
-
-
-
+*.sqlite3
diff --git a/Classes/DogViewController.h b/Classes/DogViewController.h
@@ -21,7 +21,7 @@
 }
 
 @property(nonatomic , retain) Person *owner;
-@property(nonatomic , retain) NSArray *dogs;
+@property(nonatomic , retain) NSMutableArray *dogs;
 @property(nonatomic , retain) AddDogViewController *addController;
 @property(nonatomic , retain) UITableView *tableView;
 

diff --git a/Classes/DogViewController.m b/Classes/DogViewController.m
@@ -31,7 +31,7 @@ - (void) addDogButtonClicked {
 }
 
 - (void) loadDogs {
-	self.dogs = [owner findAllDogs];
+	self.dogs = [NSMutableArray arrayWithArray:[owner findAllDogs]];
 	[tableView reloadData];
 }
 

diff --git a/Classes/PeopleViewController.h b/Classes/PeopleViewController.h
@@ -15,7 +15,7 @@
   IBOutlet UIBarButtonItem * addButton;
 }
 
-@property (nonatomic , retain) NSArray* people;
+@property (nonatomic , retain) NSMutableArray* people;
 -(IBAction) refreshButtonWasPressed;
 -(IBAction) addButtonWasPressed;
 @property(nonatomic , retain) UITableView *tableView;

diff --git a/Classes/PeopleViewController.m b/Classes/PeopleViewController.m
@@ -26,7 +26,7 @@ - (void)viewWillAppear:(BOOL)animated {
 }
 
 - (void) loadPeople {
-	self.people = [Person findAllRemote];
+	self.people = [NSMutableArray arrayWithArray:[Person findAllRemote]];
 	[tableView reloadData];
 }
 

diff --git a/sample_rails_app/config/environment.rb b/sample_rails_app/config/environment.rb
@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.1.0' unless defined? RAILS_GEM_VERSION
+# RAILS_GEM_VERSION = '2.1.0' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')