svnno****@sourc*****
svnno****@sourc*****
2008年 7月 5日 (土) 21:32:18 JST
SRADRevision: 684
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=684
Author: tach
Date: 2008-07-05 21:32:18 +0900 (Sat, 05 Jul 2008)
Log Message:
-----------
* Change varname from "modreasons_disabled" to "modreasons_select_disabled".
* Disable to show when the key "select_disabled" is true****@Slash*****().
Modified Paths:
--------------
slashjp/branches/2.5.0.192/Slash/Utility/Display/Display.pm
slashjp/branches/2.5.0.192/debian/changelog
slashjp/branches/2.5.0.192/plugins/Moderation/Moderation.pm
slashjp/branches/2.5.0.192/sql/mysql/defaults.sql
-------------- next part --------------
Modified: slashjp/branches/2.5.0.192/Slash/Utility/Display/Display.pm
===================================================================
--- slashjp/branches/2.5.0.192/Slash/Utility/Display/Display.pm 2008-07-05 04:13:03 UTC (rev 683)
+++ slashjp/branches/2.5.0.192/Slash/Utility/Display/Display.pm 2008-07-05 12:32:18 UTC (rev 684)
@@ -188,6 +188,7 @@
if ($all_name) {
$hashref = {
map { ($_, $hashref->{$_}{name}) }
+ grep { !$hashref->{$_}{select_disabled} }
keys %$hashref
};
}
Modified: slashjp/branches/2.5.0.192/debian/changelog
===================================================================
--- slashjp/branches/2.5.0.192/debian/changelog 2008-07-05 04:13:03 UTC (rev 683)
+++ slashjp/branches/2.5.0.192/debian/changelog 2008-07-05 12:32:18 UTC (rev 684)
@@ -1,8 +1,8 @@
slash (2.5.0.192-15) unstable; urgency=low
- * Add vars "modreasons_disabled" to insert "disabled => 1" for getReasons()
+ * Add vars "modreasons_select_disabled" to insert "disabled => 1" for getReasons()
- -- Taku YASUI <tach****@osdn*****> Sat, 5 Jul 2008 04:11:24 +0000
+ -- Taku YASUI <tach****@osdn*****> Sat, 5 Jul 2008 12:30:25 +0000
slash (2.5.0.192-14) unstable; urgency=low
Modified: slashjp/branches/2.5.0.192/plugins/Moderation/Moderation.pm
===================================================================
--- slashjp/branches/2.5.0.192/plugins/Moderation/Moderation.pm 2008-07-05 04:13:03 UTC (rev 683)
+++ slashjp/branches/2.5.0.192/plugins/Moderation/Moderation.pm 2008-07-05 12:32:18 UTC (rev 684)
@@ -46,10 +46,10 @@
$self->{$table_cache} = $self->sqlSelectAllHashref(
"id", "*", "modreasons"
);
- my $mrd = getCurrentStatic('modreasons_disabled') || '';
+ my $mrd = getCurrentStatic('modreasons_select_disabled') || '';
foreach my $d (split(/,/, $mrd)) {
$d = int($d);
- $self->{$table_cache}{$d}{disabled} = 1;
+ $self->{$table_cache}{$d}{select_disabled} = 1;
}
return {( %{$self->{$table_cache}} )};
}
Modified: slashjp/branches/2.5.0.192/sql/mysql/defaults.sql
===================================================================
--- slashjp/branches/2.5.0.192/sql/mysql/defaults.sql 2008-07-05 04:13:03 UTC (rev 683)
+++ slashjp/branches/2.5.0.192/sql/mysql/defaults.sql 2008-07-05 12:32:18 UTC (rev 684)
@@ -1153,7 +1153,7 @@
INSERT IGNORE INTO vars (name, value, description) VALUES ('mobile_commentmode','flat','comment mode for mobile mode');
INSERT IGNORE INTO vars (name, value, description) VALUES ('enable_template_evalperl','0','Add "EVAL_PERL" to Template option to be able to use "PERL" and "RAWPERL" directives');
INSERT IGNORE INTO vars (name, value, description) VALUES ('related_cid_disabled','0','If set, then disable inserting cid to related story list');
-INSERT IGNORE INTO vars (name, value, description) VALUES ('modreasons_disabled','','Comma separated "modreasons.id"s disable to select when moderation');
+INSERT IGNORE INTO vars (name, value, description) VALUES ('modreasons_select_disabled','','Comma separated "modreasons.id"s disable to select when moderation');
UPDATE vars SET value='text/html; charset=UTF-8' WHERE name='content_type_webpage';
UPDATE vars SET value='0' WHERE name='draconian_charset';
UPDATE vars SET value='UTF-8' WHERE name='rdfencoding';