lportal 1.0.17 → 1.0.18

data/ChangeLog

@@ -1,3 +1,14 @@
+= 1.0.18
+	- backported features from master:
+	- fixed layout resources relation
+	- comment on running tests from master branch
+	- print lportal version on init
+	- import fixture name postgresql hack to run master tests on 1.0
+	- fix journal article links
+	- using user.full as message.username if message has user
+	- creation of MB::Thread
+
+
 = 1.0.17
 	- introduced schema versions, automatic detection from the release_ table
 	- migrations imported from caterpillar trunk, define the migrations directory for caterpillar

data/lib/journal/article.rb

@@ -39,7 +39,7 @@ module Journal
 
     # Path to this article. See Tag::Asset#path.
     def path
-      self.asset.path(self.articleid)
+      self.asset.path
     end
 
   end

data/lib/mb/message.rb

@@ -59,10 +59,10 @@ module MB
         self.anonymous = false
       #end
 
-      self.subject         ||= ''
-      self.username        ||= ''
       self.createdate      = Time.now
       self.modifieddate    = Time.now
+      self.subject         ||= ''
+      self.username        ||= self.user ? self.user.fullname : ''
       self.parentmessageid ||= 0
       self.attachments     ||= false
       self.save
@@ -84,9 +84,7 @@ module MB
       unless thread
         thread = MB::Thread.create(
           :category => category,
-          :rootmessage => self,
-          :messagecount => 0,
-          :viewcount => 0
+          :rootmessage => self
         )
       end
       thread.messagecount += 1

data/lib/mb/thread.rb

@@ -8,6 +8,15 @@ module MB
       'com.liferay.portlet.messageboards.model.MBThread'
     end
 
+    # Creates a new Thread.
+    #
+    def initialize(params)
+      super(params)
+      self.messagecount ||= 0
+      self.viewcount    ||= 0
+      self.save
+    end
+
     belongs_to :category,
       :class_name => 'MB::Category',
       :foreign_key => 'categoryid'

data/lib/web/layout.rb

@@ -168,8 +168,9 @@ module Web
     belongs_to :company,
       :foreign_key => 'companyid'
 
-    has_many :resources,
-      :foreign_key => 'primkey'
+    def resources
+      Resource.find(:all, :conditions => "primkey like '#{self.plid}'")
+    end
 
     def layoutset
       Web::LayoutSet.find(:first, :conditions => "groupid=#{self.groupid} AND privatelayout=#{self.privatelayout}" )

data/lportal.rb

@@ -5,6 +5,18 @@ file = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
 this_dir = File.dirname(File.expand_path(file))
 
 require File.join(this_dir,'version')
+def info(msg)
+  msg = 'lportal: %s' % msg
+  STDOUT.puts(msg)
+end
+
+info 'version ' + Lportal::VERSION
+
+# this would be the proper place to load PostgreSQL hacks from 1.2 branch.
+# fixture hack imported from master branch would be useful while running tests,
+# however the test framework needs to be loaded before loading the fixture hack.
+#require File.join(this_dir,'active_record','fixtures.rb')
+# workaround: load that (^^) in RAILS_ROOT/test/test_helper.rb
 
 # set the migrations directory for Caterpillar
 LPORTAL_MIGRATIONS=File.expand_path(

data/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lportal
 version: !ruby/object:Gem::Version 
-  version: 1.0.17
+  version: 1.0.18
 platform: ruby
 authors: 
 - Mikael Lammentausta
@@ -9,7 +9,7 @@ autorequire: init
 bindir: bin
 cert_chain: []
 
-date: 2009-03-22 00:00:00 +02:00
+date: 2009-05-12 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency