[Rt-commit] [svn] r1053 - in rtfm/trunk: . html/RTFM/Article html/RTFM/Article/Elements

[jesse at pallas.eruditorum.org]

Author: jesse
Date: Thu Jun 10 17:28:52 2004
New Revision: 1053

Modified:
   rtfm/trunk/Makefile
   rtfm/trunk/html/RTFM/Article/Display.html
   rtfm/trunk/html/RTFM/Article/Elements/ShowHistory
Log:
In some cases, RTFM did not honor "global" rights in addition to class-specific ones

Modified: rtfm/trunk/Makefile
==============================================================================
--- rtfm/trunk/Makefile	(original)
+++ rtfm/trunk/Makefile	Thu Jun 10 17:28:52 2004
@@ -19,7 +19,7 @@
 PERL 			= /usr/bin/perl
 
 INSTALL 		= /bin/sh ./install-sh -c
-RT_PREFIX		= /opt/rt3
+RT_PREFIX		= /opt/rt/rt3.fsck.com
 
 CONFIG_FILE_PATH	= $(RT_PREFIX)/etc
 CONFIG_FILE	     	= $(CONFIG_FILE_PATH)/RT_Config.pm

Modified: rtfm/trunk/html/RTFM/Article/Display.html
==============================================================================
--- rtfm/trunk/html/RTFM/Article/Display.html	(original)
+++ rtfm/trunk/html/RTFM/Article/Display.html	Thu Jun 10 17:28:52 2004
@@ -44,8 +44,8 @@
 
 }
 
-unless ($session{'CurrentUser'}->HasRight( Object => $article->ClassObj, 
-                                           Right => 'ShowArticle')) {
+unless ($article->CurrentUserHasRight(
+                                        'ShowArticle')) {
     $m->comp("/RTFM/Elements/Error", Why => loc("Permission Denied"));
 }
 my $title =  loc( "Article #[_1]: [_2]", $article->Id, $article->Name);

Modified: rtfm/trunk/html/RTFM/Article/Elements/ShowHistory
==============================================================================
--- rtfm/trunk/html/RTFM/Article/Elements/ShowHistory	(original)
+++ rtfm/trunk/html/RTFM/Article/Elements/ShowHistory	Thu Jun 10 17:28:52 2004
@@ -35,8 +35,7 @@
     $m->comp("/RTFM/Elements/Error", Why => loc("Article not found"));
 }
 
-unless ($session{'CurrentUser'}->HasRight( Object => $article->ClassObj, 
-                                           Right => 'ShowArticle')) {
+unless ($article->ClassObj->CurrentUserHasRight('ShowArticle')) {
     $m->comp("/RTFM/Elements/Error", Why => loc("Permission Denied"));
 }