Mailing List Archive: Bricolage: devel

Fix for bug 1425 - enter key in advanced search

Index | Next | Previous | View Threaded

bret at pectopah

Mar 2, 2009, 7:33 AM

Post #1 of 12 (2055 views)
Permalink

Fix for bug 1425 - enter key in advanced search

Hi everybody,

So, it turns out that this bug was a side effect of having both simple
and advanced search on the same page.

Hitting the enter key will "click" the first image button the browser
finds, so even when you're looking at the advanced form, hitting enter
submits a simple search (because that button is still there in the form,
just not visible.)

This patch takes out the two submit buttons, so that both simple and
advanced search share a single sumbit. (The various settings on that
button get adjusted when you switch between simple and advanced.)

It works fine for me, although I haven't found a way to keep the button
on the same line as the text input when you're in simple view.

Anyway, let me know your thoughts, won't you?

Cheers,

Bret

--
Bret Dawson
Producer
Pectopah Productions Inc.
(416) 895-7635
bret [at] pectopah
www.pectopah.com

Attachments:

search_enter_key_patch.patch (11.2 KB)

david at kineticode

Mar 2, 2009, 8:41 AM

Post #2 of 12 (1978 views)
Permalink

Re: Fix for bug 1425 - enter key in advanced search [In reply to]

On Mar 2, 2009, at 7:33 AM, Bret Dawson wrote:

> This patch takes out the two submit buttons, so that both simple and
> advanced search share a single sumbit. (The various settings on that
> button get adjusted when you switch between simple and advanced.)
>
> It works fine for me, although I haven't found a way to keep the
> button
> on the same line as the text input when you're in simple view.
>
> Anyway, let me know your thoughts, won't you?

+1 This has been bugging the shit out of me.

http://bugs.bricolage.cc/show_bug.cgi?id=1425

Best,

David

rolfm at denison

Mar 2, 2009, 8:49 AM

Post #3 of 12 (1972 views)
Permalink

Re: Fix for bug 1425 - enter key in advanced search [In reply to]

On Mar 2, 2009, at 11:41 AM, David E. Wheeler wrote:

> On Mar 2, 2009, at 7:33 AM, Bret Dawson wrote:
>
>> This patch takes out the two submit buttons, so that both simple and
>> advanced search share a single sumbit. (The various settings on that
>> button get adjusted when you switch between simple and advanced.)
>>
>> It works fine for me, although I haven't found a way to keep the
>> button
>> on the same line as the text input when you're in simple view.
>>
>> Anyway, let me know your thoughts, won't you?
>
> +1 This has been bugging the shit out of me.
>
> http://bugs.bricolage.cc/show_bug.cgi?id=1425

All right, I'll work on committing it today.

-Matt

rolfm at denison

Mar 2, 2009, 4:16 PM

Post #4 of 12 (1973 views)
Permalink

Re: Fix for bug 1425 - enter key in advanced search [In reply to]

On Mar 2, 2009, at 11:49 AM, Matt Rolf wrote:

>>> Anyway, let me know your thoughts, won't you?
>>
>> +1 This has been bugging the shit out of me.
>>
>> http://bugs.bricolage.cc/show_bug.cgi?id=1425
>
> All right, I'll work on committing it today.

Looks like the patch returns the bug where clicking "Show More
Options" makes the whole div disappear in Safari. I won't have time
to look at it tonight, but you can look at the commit in Rev 8422 for
how we fixed it the last time if you want. Otherwise, we'll try and
take a look tomorrow.

-Matt

bret at pectopah

Mar 2, 2009, 5:23 PM

Post #5 of 12 (1974 views)
Permalink

Re: Fix for bug 1425 - enter key in advanced search [In reply to]

Hi everybody,

OK, I think the attached patch should be better than the last one.

Obviously I still have a lot to learn about Subversion. If I want to
totally update every file in my working copy to match what's in the
committed trunk, do I need to do something other than "svn update"?

Cheers,

Bret

On Mon, 2009-03-02 at 19:16 -0500, Matthew Rolf wrote:
> On Mar 2, 2009, at 11:49 AM, Matt Rolf wrote:
>
> >>> Anyway, let me know your thoughts, won't you?
> >>
> >> +1 This has been bugging the shit out of me.
> >>
> >> http://bugs.bricolage.cc/show_bug.cgi?id=1425
> >
> > All right, I'll work on committing it today.
>
> Looks like the patch returns the bug where clicking "Show More
> Options" makes the whole div disappear in Safari. I won't have time
> to look at it tonight, but you can look at the commit in Rev 8422 for
> how we fixed it the last time if you want. Otherwise, we'll try and
> take a look tomorrow.
>
> -Matt
>
--
Bret Dawson
Producer
Pectopah Productions Inc.
(416) 895-7635
bret [at] pectopah
www.pectopah.com

Attachments:

search_enter_key_patch_v2.patch (11.3 KB)

rolfm at denison

Mar 2, 2009, 6:04 PM

Post #6 of 12 (1971 views)
Permalink

Re: Fix for bug 1425 - enter key in advanced search [In reply to]

On Mar 2, 2009, at 8:23 PM, Bret Dawson wrote:

> Obviously I still have a lot to learn about Subversion. If I want to
> totally update every file in my working copy to match what's in the
> committed trunk, do I need to do something other than "svn update"?

I don't think so. Is that not doing the trick?

-Matt

bret at pectopah

Mar 2, 2009, 6:15 PM

Post #7 of 12 (1977 views)
Permalink

Re: Fix for bug 1425 - enter key in advanced search [In reply to]

Well, it doesn't seem to be. I did an svn update, and then edited the
three files and made the patch, but for whatever reason the old
"Element.toggle" syntax was there in the supposedly-updated files I
edited.

I tried an svn update just now, too, and it leaves my edited files
(story.html, template.html, media.html) alone, rather than reverting
them to the versions in trunk.

So obviously I don't know what I'm doing.

Help, BAMFs!

Cheers,

Bret

On Mon, 2009-03-02 at 21:04 -0500, Matthew Rolf wrote:
> On Mar 2, 2009, at 8:23 PM, Bret Dawson wrote:
>
> > Obviously I still have a lot to learn about Subversion. If I want to
> > totally update every file in my working copy to match what's in the
> > committed trunk, do I need to do something other than "svn update"?
>
>
> I don't think so. Is that not doing the trick?
>
> -Matt
>
--
Bret Dawson
Producer
Pectopah Productions Inc.
(416) 895-7635
bret [at] pectopah
www.pectopah.com

rolfm at denison

Mar 2, 2009, 6:28 PM

Post #8 of 12 (1975 views)
Permalink

Re: Fix for bug 1425 - enter key in advanced search [In reply to]

On Mar 2, 2009, at 9:15 PM, Bret Dawson wrote:

> I tried an svn update just now, too, and it leaves my edited files
> (story.html, template.html, media.html) alone, rather than reverting
> them to the versions in trunk.

svn update won't actually revert changes. If you do svn diff, and
find that you've changed the files in your working copy, you need to
run svn revert on those files to get them to go back.

> So obviously I don't know what I'm doing.
>
> Help, BAMFs!

I'm sorry, we have no BAMFs available at this time, but one of our
other associates will be happy to assist. ;)

BTW, I committed your patch (thanks!) in rev 8433, but it sprung
another leak.

http://bugs.bricolage.cc/show_bug.cgi?id=1437

-Matt

david at kineticode

Mar 2, 2009, 7:03 PM

Post #9 of 12 (1972 views)
Permalink

Re: Fix for bug 1425 - enter key in advanced search [In reply to]

On Mar 2, 2009, at 6:28 PM, Matthew Rolf wrote:

>> I tried an svn update just now, too, and it leaves my edited files
>> (story.html, template.html, media.html) alone, rather than reverting
>> them to the versions in trunk.
>
> svn update won't actually revert changes.

No, but it should make the updates that were checked in. If the
conflict with the changes you've made, you'd be told that they have
conflicts.

> If you do svn diff, and find that you've changed the files in your
> working copy, you need to run svn revert on those files to get them
> to go back.

This BAMF says no. Editing files locally does not prevent `svn up`
from modifying them.

> I'm sorry, we have no BAMFs available at this time, but one of our
> other associates will be happy to assist. ;)
>
> BTW, I committed your patch (thanks!) in rev 8433, but it sprung
> another leak.

Bret, what URL are you using for your checkout? Run `svn info` to see.

> http://bugs.bricolage.cc/show_bug.cgi?id=1437

D'oh!

D

bret at pectopah

Mar 2, 2009, 7:58 PM

Post #10 of 12 (1971 views)
Permalink

Re: Fix for bug 1425 - enter key in advanced search [In reply to]

> Bret, what URL are you using for your checkout? Run `svn info` to see.

Nothing too illuminating here, I fear.

Path: .
URL: https://svn.bricolage.cc/bricolage/trunk
Repository Root: https://svn.bricolage.cc
Repository UUID: d891ef98-e4d9-0310-886a-e7f4d30e8d80
Revision: 8432
Node Kind: directory
Schedule: normal
Last Changed Author: slanning
Last Changed Rev: 8431
Last Changed Date: 2009-03-02 12:34:37 -0500 (Mon, 02 Mar 2009)

> > http://bugs.bricolage.cc/show_bug.cgi?id=1437
>
> D'oh!
>

Stupid bug.

OK, will fix.

Cheers,

Bret

--
Bret Dawson
Producer
Pectopah Productions Inc.
(416) 895-7635
bret [at] pectopah
www.pectopah.com

david at kineticode

Mar 2, 2009, 8:49 PM

Post #11 of 12 (1969 views)
Permalink

Re: Fix for bug 1425 - enter key in advanced search [In reply to]

On Mar 2, 2009, at 7:58 PM, Bret Dawson wrote:

> Nothing too illuminating here, I fear.
>
>
> Path: .
> URL: https://svn.bricolage.cc/bricolage/trunk

Yep, that's the right place. If you run `svn up`, you're up-to-date.
Run `svn status` to see the status of your files (stuff you've
changed, conflicts, etc.).

Do you have a Bitcard/perl.org account? I'll make you a committer if
you get one.

https://www.bitcard.org/register

Best,

David

rolfm at denison

Mar 3, 2009, 6:03 AM

Post #12 of 12 (1975 views)
Permalink

Re: Fix for bug 1425 - enter key in advanced search [In reply to]

On Mar 2, 2009, at 10:03 PM, David E. Wheeler wrote:

> On Mar 2, 2009, at 6:28 PM, Matthew Rolf wrote:
>
>>> I tried an svn update just now, too, and it leaves my edited files
>>> (story.html, template.html, media.html) alone, rather than reverting
>>> them to the versions in trunk.
>>
>> svn update won't actually revert changes.
>
> No, but it should make the updates that were checked in. If the
> conflict with the changes you've made, you'd be told that they have
> conflicts.

Yep, that is correct.
>
>> If you do svn diff, and find that you've changed the files in your
>> working copy, you need to run svn revert on those files to get them
>> to go back.
>
> This BAMF says no. Editing files locally does not prevent `svn up`
> from modifying them.

Ok, my bad.

-Matt

Index | Next | Previous | View Threaded

Interested in having your list archived? Contact Gossamer Threads