Now we don't install a bookmark flag by default, this is a little glaring.

CommentFileSizeAuthor
#16 1726806.16.6-2.flag_.admin-list-hide-weight.patch2.44 KBjoachim
#14 1726806-flag-weight-6x2x.patch1.99 KBtayzlor
#10 1726806.10.flagWeights7x2x.patch2.6 KBsocketwench
#8 1726806.4.flag_.flag-admin-hide-button-weights7x2x.patch2.6 KBsocketwench
#4 1726806.4.flag_.flag-admin-hide-button-weights.patch2.63 KBjoachim
#2 1726806.2.flag_.flag-admin-hide-button-weights.patch2.5 KBjoachim
#1 flag-1726806-1.patch547 byteskid_icarus

Comments

kid_icarus’s picture

kid_icarus commented
Status: Active » Needs review
StatusFileSize
new flag-1726806-1.patch547 bytes

Here's my first crack at it :)

joachim’s picture

joachim commented
Title: don't show 'save flag order' when there are no flags » hide 'save flag order' with no flags; hide button and weight with 1 flag
Issue tags: +Needs backport to D7
StatusFileSize
new 1726806.2.flag_.flag-admin-hide-button-weights.patch2.5 KB

Looks good!

I tried this and it works perfectly. Except when I added one flag, I realized we should change things in that case too -- compare with the vocabulary admin page.

Here's a patch that extends the work you've done.

Status: Needs review » Needs work

The last submitted patch, 1726806.2.flag_.flag-admin-hide-button-weights.patch, failed testing.

joachim’s picture

joachim commented
Status: Needs work » Needs review
StatusFileSize
new 1726806.4.flag_.flag-admin-hide-button-weights.patch2.63 KB

Ah I see what went wrong there.

kid_icarus’s picture

kid_icarus commented
Status: Needs review » Reviewed & tested by the community

Looks good to me, I see what you did with the entire logic changing to "if there's more than one". Totally sensible.

joachim’s picture

joachim commented
Status: Reviewed & tested by the community » Fixed

Committed. Thanks for your help!

Issue #1726806 by kid_icarus, joachim: Fixed 'save flag order' button and flag weight showing when there are fewer than 2 flags.

joachim’s picture

joachim commented
Version: 7.x-3.x-dev » 7.x-2.x-dev
Status: Fixed » Patch (to be ported)
Issue tags: -Novice, -Needs backport to D7

And now on the 7.x-2.x branch.

socketwench’s picture

socketwench commented
Status: Patch (to be ported) » Needs review
StatusFileSize
new 1726806.4.flag_.flag-admin-hide-button-weights7x2x.patch2.6 KB

*backports*

joachim’s picture

joachim commented
Status: Needs review » Needs work

Doesn't quite look right I'm afraid -- the weights get shown below the table and the columns go wrong.

socketwench’s picture

socketwench commented
StatusFileSize
new 1726806.10.flagWeights7x2x.patch2.6 KB 
+++ b/includes/flag.admin.incundefined
@@ -72,15 +79,17 @@ function theme_flag_admin_listing($variables) {
+    if (count($flag) > 1) {

Should have been $flags, not $flag.

socketwench’s picture

socketwench commented
Status: Needs work » Needs review
joachim’s picture

joachim commented
Status: Needs review » Fixed

Tests pass and patch works fine. Committed!

Issue #1726806 by socketwench, kid_icarus, joachim: Fixed 'save flag order' button and flag weight showing when there are fewer than 2 flags.

joachim’s picture

joachim commented
Version: 7.x-2.x-dev » 6.x-2.x-dev
Status: Fixed » Patch (to be ported)

To keep the two 2.x branches in sync we should backport this.

tayzlor’s picture

tayzlor commented
StatusFileSize
new 1726806-flag-weight-6x2x.patch1.99 KB

Here's a 6.x-2.x patch

tayzlor’s picture

tayzlor commented
Status: Patch (to be ported) » Needs review
joachim’s picture

joachim commented
StatusFileSize
new 1726806.16.6-2.flag_.admin-list-hide-weight.patch2.44 KB

Thanks!

Here's a slight correction to that patch -- was missing the tweak to the table header when there's no tabledrag.

joachim’s picture

joachim commented
Status: Needs review » Fixed

Committed.

Thanks to everyone who's worked on this!

Beta 9 on the way soon :)

Issue #1726806 by tayzlor, kid_icarus, joachim: Fixed 'save flag order' button and flag weight showing when there are fewer than 2 flags.

Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for 2 weeks with no activity.