[Ngetsuite-cvs] ngetsuite/web group.rhtml,1.3,1.4 release.rhtml,1.1,1.2

[<ys...@us...>]

Update of /cvsroot/ngetsuite/ngetsuite/web
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5607/web

Modified Files:
	group.rhtml release.rhtml 
Log Message:
small fixes, more to come


Index: group.rhtml
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/web/group.rhtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** group.rhtml	4 Feb 2004 15:40:22 -0000	1.3
--- group.rhtml	17 Feb 2004 14:56:32 -0000	1.4
***************
*** 111,115 ****
  
  	orphanq = "select count(*), sum(`size`) from `articles` "
! 	orphanq += "where `release`='' "
  
  	orphanq += "and DATE_FORMAT(`time`, '%Y-%m-%d')='#{web.date}' " if web.date != "any"
--- 111,115 ----
  
  	orphanq = "select count(*), sum(`size`) from `articles` "
! 	orphanq += "where `group`='#{web.group._fullname}' and `release`='' "
  
  	orphanq += "and DATE_FORMAT(`time`, '%Y-%m-%d')='#{web.date}' " if web.date != "any"
***************
*** 124,128 ****
  	}
  %>
! 			<a href="orphans.rhtml?group=<%= web.group %>&date=<%= web.date %>"><%= orphans %></a>
  		</td>
  	</tr>
--- 124,128 ----
  	}
  %>
! 			<a target="right" href="release.rhtml?mid=&group=<%= web.group._fullname %>&date=<%= web.date %>"><%= orphans %></a>
  		</td>
  	</tr>

Index: release.rhtml
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/web/release.rhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** release.rhtml	4 Feb 2004 03:07:57 -0000	1.1
--- release.rhtml	17 Feb 2004 14:56:32 -0000	1.2
***************
*** 15,26 ****
  	attr_reader :articles, :nfos
  
! 	def initialize(group,mid)
  		@articles = Array.new
  		@nfos = Array.new
  
! 		@rls = NgetSuite::Release.new(group,mid,true)
  
  		artq = "select * from `articles` a left join `nfos` n using (`mid`) "
  		artq += "where a.`group`='#{group}' and `release`='#{mid}'"
  		artq += "order by `subject`"
  
--- 15,27 ----
  	attr_reader :articles, :nfos
  
! 	def initialize(group,mid,date)
  		@articles = Array.new
  		@nfos = Array.new
  
! 		@rls = NgetSuite::Release.new(group,mid,true) if mid
  
  		artq = "select * from `articles` a left join `nfos` n using (`mid`) "
  		artq += "where a.`group`='#{group}' and `release`='#{mid}'"
+ 		artq += "and DATE_FORMAT(`time`, '%Y-%m-%d')='#{date}' " if date != "any"
  		artq += "order by `subject`"
  
***************
*** 47,51 ****
  <a href="queue.rhtml?group=<%= web.group._fullname %>">return to queue list</a>
  
! <% rls = ReleaseArticles.new(web.group._fullname, web.rlsmid) %>
  
  <a name="top"></a>
--- 48,56 ----
  <a href="queue.rhtml?group=<%= web.group._fullname %>">return to queue list</a>
  
! <% rls = ReleaseArticles.new(web.group._fullname, web.rlsmid, web.date) %>
! 
! 
! <% if web.rlsmid %>
! 
  
  <a name="top"></a>
***************
*** 70,73 ****
--- 75,86 ----
  <% } %>
  
+ 
+ <% else %>
+ 
+ <h1>Orphan files</h1>
+ <%= "<h2>posted on #{web.date_str}</h2>" if web.date %>
+ 
+ <% end %>
+ 
  <a name="artlist"></a>
  <div class="group">Articles list</div>