Skip to content

Commit ba51482

Browse files
valadasvaladas
authored
Merge pull request #66 from valadas/search-enter
Fixed an issue where pressing enter in search filed would cause wrong action
2 parents 6974d79 + 73d8244 commit ba51482

2 files changed

Lines changed: 28 additions & 35 deletions

File tree

‎Repository.ascx.cs‎

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1686,7 +1686,7 @@ private void GenerateTemplateOutput(string[] pTemplate, object dataItem, PlaceHo
16861686
objPlaceHolder.Controls.Add(objCommentsPanel);
16871687
try
16881688
{
1689-
if (ViewState["mView"].ToString().ToLower() == "details")
1689+
if (ViewState["mView"] != null && ViewState["mView"].ToString().ToLower() == "details")
16901690
{
16911691
string bShowComments = oRepositoryBusinessController.GetSkinAttribute(xmlDetailsDoc, "COMMENTS", "ShowOnOpen", "false");
16921692
if (bShowComments.ToLower() == "true")
@@ -2534,29 +2534,33 @@ private void ParseHeaderTemplate()
25342534
}
25352535
break;
25362536
case "SEARCH":
2537+
// search panel
2538+
Panel searchPanel = new Panel();
25372539
// search label
2538-
Label objLabel = new Label();
2539-
objLabel.Text = Localization.GetString("Search", LocalResourceFile);
2540-
objLabel.CssClass = oRepositoryBusinessController.GetSkinAttribute(xmlHeaderDoc, "SEARCH", "CssClass", "normal");
2541-
hPlaceHolder.Controls.Add(objLabel);
2540+
Label searchLabel = new Label();
2541+
searchLabel.Text = Localization.GetString("Search", LocalResourceFile);
2542+
searchLabel.CssClass = oRepositoryBusinessController.GetSkinAttribute(xmlHeaderDoc, "SEARCH", "CssClass", "normal");
2543+
searchPanel.Controls.Add(searchLabel);
25422544
// search box
2543-
TextBox objTextbox = new TextBox();
2544-
objTextbox.ID = "__Search";
2545-
objTextbox.TextMode = TextBoxMode.SingleLine;
2546-
objTextbox.CssClass = oRepositoryBusinessController.GetSkinAttribute(xmlDoc, "SEARCHBOX", "CssClass", "normal");
2547-
objTextbox.Width = Unit.Parse(oRepositoryBusinessController.GetSkinAttribute(xmlHeaderDoc, "SEARCHBOX", "Width", "75"));
2548-
objTextbox.Text = mFilter;
2549-
hPlaceHolder.Controls.Add(objTextbox);
2545+
TextBox searchTextbox = new TextBox();
2546+
searchTextbox.ID = "__Search";
2547+
searchTextbox.TextMode = TextBoxMode.SingleLine;
2548+
searchTextbox.CssClass = oRepositoryBusinessController.GetSkinAttribute(xmlDoc, "SEARCHBOX", "CssClass", "normal");
2549+
searchTextbox.Width = Unit.Parse(oRepositoryBusinessController.GetSkinAttribute(xmlHeaderDoc, "SEARCHBOX", "Width", "75"));
2550+
searchTextbox.Text = mFilter;
2551+
searchPanel.Controls.Add(searchTextbox);
25502552
// search button
2551-
Button objButton = new Button();
2552-
objButton.ID = "btnSearch";
2553-
objButton.Text = Localization.GetString("SearchButton", LocalResourceFile);
2554-
objButton.CssClass = oRepositoryBusinessController.GetSkinAttribute(xmlHeaderDoc, "SEARCHBUTTON", "CssClass", "normal");
2555-
objButton.CommandName = "Search";
2556-
objButton.EnableViewState = true;
2557-
objButton.ToolTip = Localization.GetString("ClickToSearch", LocalResourceFile);
2558-
objButton.Click += btnSearch_Click;
2559-
hPlaceHolder.Controls.Add(objButton);
2553+
Button searchButton = new Button();
2554+
searchButton.ID = "btnSearch";
2555+
searchButton.Text = Localization.GetString("SearchButton", LocalResourceFile);
2556+
searchButton.CssClass = oRepositoryBusinessController.GetSkinAttribute(xmlHeaderDoc, "SEARCHBUTTON", "CssClass", "normal");
2557+
searchButton.CommandName = "Search";
2558+
searchButton.EnableViewState = true;
2559+
searchButton.ToolTip = Localization.GetString("ClickToSearch", LocalResourceFile);
2560+
searchButton.Click += btnSearch_Click;
2561+
searchPanel.Controls.Add(searchButton);
2562+
searchPanel.DefaultButton = searchButton.ClientID;
2563+
hPlaceHolder.Controls.Add(searchPanel);
25602564
break;
25612565
case "MODERATEBUTTON":
25622566
if (oRepositoryBusinessController.IsModerator(PortalId, ModuleId))

‎RepositoryDashboard.ascx.cs‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
using Microsoft.VisualBasic;
21
using System;
32
using System.Collections;
4-
using System.Data;
5-
using System.Diagnostics;
6-
using System.Drawing;
7-
using System.Linq;
83
//
94
// DotNetNuke® - http://www.dotnetnuke.com
105
// Copyright (c) 2002-2005
@@ -24,23 +19,17 @@
2419
// CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
2520
// DEALINGS IN THE SOFTWARE.
2621

27-
using System.Data.SqlClient;
28-
using System.Xml;
29-
using System.Web;
3022
using System.Web.UI;
3123
using System.Web.UI.WebControls;
32-
using System.Web.UI.HtmlControls;
33-
using DotNetNuke;
3424
using DotNetNuke.Security;
3525
using DotNetNuke.Services.Localization;
3626
using DotNetNuke.Entities.Modules;
3727
using DotNetNuke.UI.WebControls;
38-
using DotNetNuke.Entities.Modules.Communications;
3928

4029
namespace DotNetNuke.Modules.Repository
41-
{
42-
43-
public abstract class RepositoryDashboard : Entities.Modules.PortalModuleBase, Entities.Modules.IActionable, Entities.Modules.Communications.IModuleCommunicator
30+
{
31+
32+
public abstract class RepositoryDashboard : Entities.Modules.PortalModuleBase, Entities.Modules.IActionable, Entities.Modules.Communications.IModuleCommunicator
4433
{
4534

4635
#region "Controls"

0 commit comments

Comments
 (0)