Modified: branches/versions/app/controllers/blobs_controller.rb (3049 => 3050)
--- branches/versions/app/controllers/blobs_controller.rb 2012-07-27 15:23:41 UTC (rev 3049)
+++ branches/versions/app/controllers/blobs_controller.rb 2012-07-27 15:35:17 UTC (rev 3050)
@@ -184,13 +184,9 @@
# Create a new content blob entry if new data is provided.
if params[:blob][:data] && params[:blob][:data].size > 0
- puts "AAAAAAAAAAAAAA"
@blob.build_content_blob(:data ="" params[:blob][:data].read)
- puts "BBBBBBBBBBBBBB"
@blob.local_name = params[:blob][:data].original_filename
- puts "CCCCCCCCCCCCCC"
@blob.content_type = ContentType.find_or_create_by_mime_type(:user => current_user, :title => params[:blob][:data].content_type, :mime_type => params[:blob][:data].content_type, :category => 'Blob')
-puts "@blob.content_type = address@hidden"
end
params[:blob].delete(:data)
@@ -304,6 +300,12 @@
if Authorization.is_authorized?(action_name, nil, blob, current_user)
@blob = blob
+ if params[:version]
+ @version = @blob.find_version(params[:version])
+ else
+ @version = @blob.versions.last
+ end
+
@blob_entry_url = url_for : false,
:host => base_host,
:id => @blob.id
Modified: branches/versions/vendor/plugins/versioning/lib/versioning.rb (3049 => 3050)
--- branches/versions/vendor/plugins/versioning/lib/versioning.rb 2012-07-27 15:23:41 UTC (rev 3049)
+++ branches/versions/vendor/plugins/versioning/lib/versioning.rb 2012-07-27 15:35:17 UTC (rev 3050)
@@ -31,13 +31,6 @@
raise ActiveRecord::RecordNotFound.new("Couldn't find #{self.version_class.name} with #{self.versioned_resource_column}=#{id} and version=#{v}")
end
- def describe_version(version_number)
- return "" if versions.count < 2
- return "(earliest)" if version_number == versions.first.version
- return "(latest)" if version_number == versions.last.version
- return ""
- end
-
def changed_versioned_attributes
versioned_attributes.select do |attr|
changes[attr.to_s] || (send(attr).respond_to?(:changed) && send(attr).changed?)
@@ -50,6 +43,13 @@
def new_version?
new_record? || (changed_versioned_attributes - mutable_attributes).length > 0
end
+
+ def describe_version(version_number)
+ return "" if versions.count < 2
+ return "(earliest)" if version_number == versions.first.version
+ return "(latest)" if version_number == versions.last.version
+ return ""
+ end
end
before_save do |resource|