You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@whimsical.apache.org by Craig Russell <ap...@gmail.com> on 2020/07/18 05:02:48 UTC
Patch for workbench emeritus action
This patch implements the changes that will open the roster/committer page in a different window in the secretary workbench.
diff --git a/www/secretary/workbench/server.rb b/www/secretary/workbench/server.rb
index 827225db..37fab606 100644
--- a/www/secretary/workbench/server.rb
+++ b/www/secretary/workbench/server.rb
@@ -77,7 +77,7 @@ get '/' do
href: "/roster/committer/#{id}",
from: ASF::Person.find(id).cn,
subject: "Pending emeritus request - #{days.to_s} days old",
- status: days < 10.0 ? 'Pending' : 'Ready'
+ status: days < 10.0 ? :emeritusPending : :emeritusReady
}
end
diff --git a/www/secretary/workbench/views/index.js.rb b/www/secretary/workbench/views/index.js.rb
index c4ff9351..0e64d2e6 100644
--- a/www/secretary/workbench/views/index.js.rb
+++ b/www/secretary/workbench/views/index.js.rb
@@ -46,8 +46,9 @@ class Index < Vue
}
_tr row_options do
+ target = ((message.status == :emeritusReady) || (message.status == :emeritusPending)) ? "_blank" : "_self"
_td do
- _a time, href: "#{message.href}", title: message.time
+ _a time, href: "#{message.href}", title: message.time, target: target
end
_td message.from
_td message.subject
Craig L Russell
clr@apache.org
Re: Patch for workbench emeritus action
Posted by Craig Russell <ap...@gmail.com>.
I was also thinking that this would be more elegant:
message.status.in? ([:emeritusReady, :emeritusPending])
WDYT?
Craig
> On Jul 18, 2020, at 7:13 AM, sebb <se...@gmail.com> wrote:
>
> On Sat, 18 Jul 2020 at 06:02, Craig Russell <apache.clr@gmail.com <ma...@gmail.com>> wrote:
>>
>> This patch implements the changes that will open the roster/committer page in a different window in the secretary workbench.
>>
>> diff --git a/www/secretary/workbench/server.rb b/www/secretary/workbench/server.rb
>> index 827225db..37fab606 100644
>> --- a/www/secretary/workbench/server.rb
>> +++ b/www/secretary/workbench/server.rb
>> @@ -77,7 +77,7 @@ get '/' do
>> href: "/roster/committer/#{id}",
>> from: ASF::Person.find(id).cn,
>> subject: "Pending emeritus request - #{days.to_s} days old",
>> - status: days < 10.0 ? 'Pending' : 'Ready'
>> + status: days < 10.0 ? :emeritusPending : :emeritusReady
>> }
>> end
>>
>> diff --git a/www/secretary/workbench/views/index.js.rb b/www/secretary/workbench/views/index.js.rb
>> index c4ff9351..0e64d2e6 100644
>> --- a/www/secretary/workbench/views/index.js.rb
>> +++ b/www/secretary/workbench/views/index.js.rb
>> @@ -46,8 +46,9 @@ class Index < Vue
>> }
>>
>> _tr row_options do
>> + target = ((message.status == :emeritusReady) || (message.status == :emeritusPending)) ? "_blank" : "_self"
>> _td do
>> - _a time, href: "#{message.href}", title: message.time
>> + _a time, href: "#{message.href}", title: message.time, target: target
>
> Looks OK to me; not sure the target variable is really needed.
> Could also do something like:
>
> if ((message.status == :emeritusReady) || (message.status == :emeritusPending))
> _a time, href: "#{message.href}", title: message.time, target: '_blank'
> else
> _a time, href: "#{message.href}", title: message.time
> end
>
>> end
>> _td message.from
>> _td message.subject
>>
>> Craig L Russell
>> clr@apache.org <ma...@apache.org>
Craig L Russell
clr@apache.org
Re: Patch for workbench emeritus action
Posted by sebb <se...@gmail.com>.
On Sat, 18 Jul 2020 at 06:02, Craig Russell <ap...@gmail.com> wrote:
>
> This patch implements the changes that will open the roster/committer page in a different window in the secretary workbench.
>
> diff --git a/www/secretary/workbench/server.rb b/www/secretary/workbench/server.rb
> index 827225db..37fab606 100644
> --- a/www/secretary/workbench/server.rb
> +++ b/www/secretary/workbench/server.rb
> @@ -77,7 +77,7 @@ get '/' do
> href: "/roster/committer/#{id}",
> from: ASF::Person.find(id).cn,
> subject: "Pending emeritus request - #{days.to_s} days old",
> - status: days < 10.0 ? 'Pending' : 'Ready'
> + status: days < 10.0 ? :emeritusPending : :emeritusReady
> }
> end
>
> diff --git a/www/secretary/workbench/views/index.js.rb b/www/secretary/workbench/views/index.js.rb
> index c4ff9351..0e64d2e6 100644
> --- a/www/secretary/workbench/views/index.js.rb
> +++ b/www/secretary/workbench/views/index.js.rb
> @@ -46,8 +46,9 @@ class Index < Vue
> }
>
> _tr row_options do
> + target = ((message.status == :emeritusReady) || (message.status == :emeritusPending)) ? "_blank" : "_self"
> _td do
> - _a time, href: "#{message.href}", title: message.time
> + _a time, href: "#{message.href}", title: message.time, target: target
Looks OK to me; not sure the target variable is really needed.
Could also do something like:
if ((message.status == :emeritusReady) || (message.status == :emeritusPending))
_a time, href: "#{message.href}", title: message.time, target: '_blank'
else
_a time, href: "#{message.href}", title: message.time
end
> end
> _td message.from
> _td message.subject
>
> Craig L Russell
> clr@apache.org
>