Merge with default

This commit is contained in:
Ruslan Keba 2013-03-27 16:43:40 +02:00
commit b1b36dfc27
85 changed files with 5999 additions and 121 deletions

View file

@ -30,6 +30,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Security;
using System.Text;
using Microsoft.Practices.EnterpriseLibrary.Caching;
@ -167,7 +168,7 @@ namespace WebsitePanel.Providers.Web.WPIWebApplicationGallery
foreach (Keyword keyword in wpi.GetKeywords())
{
if (wpi.IsKeywordApplication(keyword))
if (wpi.IsKeywordApplication(keyword) && !wpi.IsHiddenKeyword(keyword))
{
categories.Add(new GalleryCategory
{
@ -395,7 +396,8 @@ namespace WebsitePanel.Providers.Web.WPIWebApplicationGallery
LastUpdated = product.Published,
Published = product.Published,
Link = (null==product.Link) ? "" :product.Link.ToString(),
InstallerFileSize = size
InstallerFileSize = size,
Keywords = product.Keywords.Select(keyword => keyword.Id).ToList()
};
}