Skip to content

Commit

Permalink
Changed tests to match additions to Project and Tag models.
Browse files Browse the repository at this point in the history
Added sequence to Tag factory to fix random problems with 'text already taken'.
Added lat and long to prject serialiser.
Removed Google Maps from home template.

modified:   app/assets/templates/home.html
modified:   app/serializers/project_serializer.rb
modified:   config/initializers/secret_token.rb
modified:   spec/controllers/projects_controller_spec.rb
modified:   spec/controllers/tags_controller_spec.rb
modified:   spec/factories/project_factory.rb
modified:   spec/factories/tag_factory.rb
modified:   spec/factories/user_factory.rb
  • Loading branch information
Mark Cottman-Fields committed Feb 19, 2013
1 parent 02b1697 commit 2d2d625
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 15 deletions.
14 changes: 0 additions & 14 deletions app/assets/templates/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,4 @@ <h3>Download annotations</h3>
Download all annotations on site (temporary). In
<a ng-href="{{downloadAnnotationLink}}" target="_blank">csv</a> format.
</p>

<div id="map_canvas" style="width:100%; height:600px;z-index:2;"></div>

<script type="text/javascript">
$(document).ready(function () {
var mapOptions = {
center: new google.maps.LatLng(-34.397, 150.644),
zoom: 8,
mapTypeId: google.maps.MapTypeId.ROADMAP
};
var map = new google.maps.Map(document.getElementById("map_canvas"),
mapOptions);
});
</script>
</div>
2 changes: 1 addition & 1 deletion app/serializers/project_serializer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class PhotosInProjectSerializer < CommonAttributesSerializer


class ProjectSerializer < CommonAttributesSerializer
attributes :id, :name, :description, :urn, :notes
attributes :id, :name, :description, :urn, :notes, :latitude, :longitude

has_many :sites, :serializer => SitesInProjectSerializer
has_many :photos, :serializer => PhotosInProjectSerializer
Expand Down

0 comments on commit 2d2d625

Please sign in to comment.