Changeset 13783 for trunk/WorkflowPlugin/lib/Foswiki/Plugins/WorkflowPlugin/ControlledTopic.pm

Timestamp:

01/22/12 19:38:41 (4 months ago)

Author:

CrawfordCurrie

Message:

Item11461: no functional changes, just some code cleanup and debugging used to complete this task

File:

• trunk/WorkflowPlugin/lib/Foswiki/Plugins/WorkflowPlugin/ControlledTopic.pm (modified) (4 diffs)

trunk/WorkflowPlugin/lib/Foswiki/Plugins/WorkflowPlugin/ControlledTopic.pm

@@ -183 +183 @@
 # Some day we may handle the can... functions indepedently. For now,
 # they all check editability thus....
-sub isModifyable {
-    my $this = shift;
+sub _isModifiable {
+    my ($this) = @_;
+    my $meta = $this->{meta};
 
     return $this->{isEditable} if defined $this->{isEditable};
 
     # See if the workflow allows an edit
-    unless ( defined $this->{isEditable} ) {
-        $this->{isEditable} = (
-            $this->isLatestRev()
-
-              # Does the workflow permit editing?
-              && $this->{workflow}->allowEdit($this)
-
-              # Does Foswiki permit editing?
-              # DO NOT PASS $this->{meta}, because of Item11461
-              && Foswiki::Func::checkAccessPermission(
-                'CHANGE',      $Foswiki::Plugins::SESSION->{user},
-                $this->{text}, $this->{topic},
-                $this->{web}
-              )
-        ) ? 1 : 0;
-    }
+    # is the latest rev (or no rev) loaded?
+    $this->{isEditable} = $this->isLatestRev();
+    #print STDERR "Modify denied by isLatestRev\n" unless $this->{isEditable};
+
+    # Does the workflow permit editing?
+    if ($this->{isEditable}) {
+        $this->{isEditable} = $this->{workflow}->allowEdit($this);
+        #print STDERR "Modify denied by allowEdit\n" unless $this->{isEditable};
+    }
+    # Does Foswiki permit editing?
+    if ($this->{isEditable}) {
+        # DO NOT PASS $this->{meta}, because of Item11461
+        $this->{isEditable} = Foswiki::Func::checkAccessPermission(
+            'CHANGE',      $Foswiki::Plugins::SESSION->{user},
+            $this->{text}, $this->{topic},
+            $this->{web} ) if $this->{isEditable};
+        #print STDERR "Modify denied by checkAccessPermission\n" unless $this->{isEditable};
+    }
+    $this->{isEditable} ||= 0; # ensure defined
+
     return $this->{isEditable};
 }
@@ -211 +216 @@
 sub canEdit {
     my $this = shift;
-    return $this->isModifyable($this);
+    return $this->_isModifiable();
+}
+
+# Return tue if this topic is editable
+sub canSave {
+    my $this = shift;
+    return $this->_isModifiable();
 }
 
@@ -217 +228 @@
 sub canAttach {
     my $this = shift;
-    return $this->isModifyable($this);
+    return $this->_isModifiable();
 }
 
@@ -223 +234 @@
 sub canFork {
     my $this = shift;
-    return $this->isModifyable($this);
+    return $this->_isModifiable();
 }