[prev in list] [next in list] [prev in thread] [next in thread]
List: bricolage-commits
Subject: [Bricolage-Commits] Patch applied from Bug # 227.
From: David Wheeler <wheeler () users ! sourceforge ! net>
Date: 2002-08-29 18:53:44
[Download RAW message or body]
Log Message:
-----------
Patch applied from Bug # 227. On My Workspace, all desks are now listed in the
Select list. I also took the opportunity to change the spelling of Joao
Pedro's name in Bric::Changes.
Modified Files:
--------------
/cvsroot/bricolage/bricolage/comp/widgets/desk:
desk.mc
/cvsroot/bricolage/bricolage/lib/Bric:
Changes.pod
["wheeler-2002829185344-diff.txt" (wheeler-2002829185344-diff.txt)]
Index: desk.mc
===================================================================
RCS file: /cvsroot/bricolage/bricolage/comp/widgets/desk/desk.mc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -d -r1.10 -r1.11
--- desk.mc 18 Aug 2002 21:51:52 -0000 1.10
+++ desk.mc 29 Aug 2002 18:53:42 -0000 1.11
@@ -69,7 +69,8 @@
if (my $curr_objs = $objs->{$ckey}) {
if ($sort_by) {
# Check for READ permission and sort them.
- my ($sort_get, $sort_arg) = @{$meths->{$sort_by}}{'get_meth', 'get_args'};
+ my ($sort_get, $sort_arg) =
+ @{$meths->{$sort_by}}{'get_meth', 'get_args'};
my $type = $meths->{$sort_by}{props}{type};
if ($sort_by eq 'id') {
# Do a numerical sort.
@@ -83,9 +84,10 @@
$sort_get->($b, ISO_8601_FORMAT)
}map { chk_authz($_, READ, 1) ? $_ : () } @$curr_objs;
} else {
- # Do a case-insensitive osrt.
+ # Do a case-insensitive sort.
@$curr_objs = sort {
- lc $sort_get->($a, @$sort_arg) cmp lc $sort_get->($b, @$sort_arg)
+ lc $sort_get->($a, @$sort_arg) cmp
+ lc $sort_get->($b, @$sort_arg)
}map { chk_authz($_, READ, 1) ? $_ : () } @$curr_objs;
}
@@ -133,7 +135,8 @@
}
}
-if (my $objs = &$cached_assets($class, $desk, $user_id, $class, $meths, $sort_by)) {
+if (my $objs = &$cached_assets($class, $desk, $user_id, $class, $meths,
+ $sort_by)) {
$m->comp("/widgets/desk/desk_top.html",
class => $class,
@@ -150,7 +153,8 @@
my $aid = $obj->get_id;
# Grab the type name.
my $atid = $obj->get_element__id;
- my $type = defined $atid ? $types{$atid} ||= $obj->get_element_name : '';
+ my $type = defined $atid ? $types{$atid} ||=
+ $obj->get_element_name : '';
# Grab the User ID.
my $user_id = $obj->get_user__id;
@@ -178,8 +182,8 @@
} else {
$desk_opts = undef;
my $uid = $obj->get_user__id;
- $user = $users{$uid} ||=
- Bric::Biz::Person::User->lookup({ id => $uid })->format_name;
+ $user = $users{$uid} ||= Bric::Biz::Person::User->lookup
+ ({ id => $uid })->format_name;
}
}
} else {
@@ -204,7 +208,6 @@
} elsif (ref($obj) =~ /Formatting$/) {
($wf) = Bric::Biz::Workflow->list({'type' => 1});
}
-
# assign to workflow
$obj->set_workflow_id($wf->get_id());
}
@@ -263,7 +266,6 @@
"' had no associated workflow. It has been ".
"assigned to the '".$a_wf->get_name."' workflow.";
-
if ($desk) {
my @ad = $a_wf->allowed_desks;
unless (grep($desk->get_id == $_->get_id, @ad)) {
@@ -277,14 +279,12 @@
"' desk";
}
}
-
add_msg($msg);
}
foreach ($a_wf->allowed_desks) {
- # Do not include the current desk in the list.
- next if $_->get_id eq $desk_id;
- push @$desk_opts, [join('-',$aid,$desk_id,$_->get_id,$class), $_->get_name];
+ push @$desk_opts, [join('-',$aid,$desk_id,$_->get_id,$class),
+ $_->get_name];
}
}
Index: Changes.pod
===================================================================
RCS file: /cvsroot/bricolage/bricolage/lib/Bric/Changes.pod,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -w -d -r1.148 -r1.149
--- Changes.pod 29 Aug 2002 02:54:01 -0000 1.148
+++ Changes.pod 29 Aug 2002 18:53:42 -0000 1.149
@@ -62,6 +62,12 @@
Michael Schwern for helping to diagnose the problem and come up with a
solution. [David]
+=item *
+
+The select list of desks to transfer an asset to on My Workspace now includes
+all possible desks, including the one for which there is a link. [JoE<atilde>o
+Pedro]
+
=back
=head1 VERSION 1.3.3
@@ -235,7 +241,7 @@
=item *
Added constraint to the group table to keep a group from having itself as a
-parent. Thanks to Joao Pedro Goncalves for the patch. [David]
+parent. Thanks to JoE<atilde>o Pedro GonE<ccedil>alves for the patch. [David]
=item *
@@ -497,7 +503,7 @@
Clicking "Add More" when editing contributor contacts now retains any changes
made to the contributor profile. This matches the functionality of the user
-profile. Thanks to Joao Pedro Goncalves for the spot. [David]
+profile. Thanks to JoE<atilde>o Pedro GonE<ccedil>alves for the spot. [David]
=item *
@@ -523,7 +529,8 @@
=item *
The Bric::Biz::Category class method get_attr() now returns attributes for
-category ID 0 as well as all other categories. [Joao Pedro Goncalves]
+category ID 0 as well as all other categories. [JoE<atilde>o Pedro
+GonE<ccedil>alves]
=item *
@@ -572,7 +579,7 @@
=item *
Fixed bug where attribute metadata wasn't getting deleted when it was
-supposed to. [Joao Pedro Goncalves]
+supposed to. [JoE<atilde>o Pedro GonE<ccedil>alves]
=item *
@@ -761,8 +768,8 @@
=item *
-The view button in the element profile now works correctly. Thanks to Joao Pedro
-Goncalves for the spot. [David]
+The view button in the element profile now works correctly. Thanks to
+JoE<atilde>o Pedro GonE<ccedil>alves for the spot. [David]
=item *
@@ -771,9 +778,9 @@
=item *
-Checking in a template from a template profile now performs a syntax
-check of the template just as saving the template does. [Joao Pedro
-Goncalves]
+Checking in a template from a template profile now performs a syntax check of
+the template just as saving the template does. [JoE<atilde>o Pedro
+GonE<ccedil>alves]
=item *
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Bricolage-Commits mailing list
Bricolage-Commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bricolage-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic