[Codestriker-commits] CVS update: codestriker/template/en/default viewtopicproperties.html.tmpl

[<si...@us...>]

  Created Codestriker topic at:
  http://codestriker.sourceforge.net/cgi-bin/codestriker.pl?topic=2101609&action=view&brmode=1&fview=-1

  User: sits    
  Date: 04/11/09 13:01:19

  Modified:    .        CHANGELOG
               lib/Codestriker/Action SubmitEditTopicProperties.pm
               lib/Codestriker/Http Render.pm
               template/en/default viewtopicproperties.html.tmpl
  Log:
  Topics can now be obsoleted from the topic properties screen, by selecting
  the Obsoleted state.
  
  Also minor fix where " characters would not render correctly in the
  status bar or in a tool-tip when hovering over a commented line in
  the view topic window.
  
  
  
  Index: CHANGELOG
  ===================================================================
  RCS file: /cvsroot/codestriker/codestriker/CHANGELOG,v
  retrieving revision 1.152
  retrieving revision 1.153
  diff -u -r1.152 -r1.153
  --- CHANGELOG	3 Nov 2004 20:48:32 -0000	1.152
  +++ CHANGELOG	9 Nov 2004 21:01:03 -0000	1.153
  @@ -34,6 +34,10 @@
   
   * Shorten the URLs sent in the email messages.
   
  +* Minor fix where " characters would not render correctly in the
  +  status bar or in a tool-tip when hovering over a commented line in
  +  the view topic window.
  +
   Version 1.8.4
   
   * The topic properties page now displays the start tag, end tag and
  
  
  
  
  
  Index: SubmitEditTopicProperties.pm
  ===================================================================
  RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/Action/SubmitEditTopicProperties.pm,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- SubmitEditTopicProperties.pm	29 Jun 2004 02:51:41 -0000	1.8
  +++ SubmitEditTopicProperties.pm	9 Nov 2004 21:01:10 -0000	1.9
  @@ -36,9 +36,11 @@
       my $repository_url = $http_input->get('repository');
       my $projectid = $http_input->get('projectid');
   
  -    # Check if this action is allowed.
  +    # Check if this action is allowed, and that the state is valid.
       if ($Codestriker::allow_delete == 0 && $topic_state eq "Delete") {
   	$http_response->error("This function has been disabled");
  +    } elsif (! grep /^$topic_state$/, @Codestriker::topic_states) {
  +	$http_response->error("Topic state $topic_state unrecognised");
       }
   
       # Retrieve the current state of the topic.
  @@ -89,6 +91,15 @@
   		$feedback = "Topic has been deleted.";
   	    }
   	}
  +	elsif ($topic_state eq "Obsoleted") {
  +	    # Redirect to the create topic screen with this topic being
  +	    # the one to obsolete.
  +	    my $url_builder = Codestriker::Http::UrlBuilder->new($query);
  +	    my $create_topic_url =
  +		$url_builder->create_topic_url("$topicid,$version");
  +	    print $query->redirect(-URI=>$create_topic_url);
  +	    return;
  +	}
   	else {
   	    # The input looks good, update the database.
   	    $rc = $topic->update($topic_title, $author, $reviewers, $cc,
  
  
  
  
  
  Index: Render.pm
  ===================================================================
  RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/Http/Render.pm,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- Render.pm	27 Sep 2004 11:13:13 -0000	1.38
  +++ Render.pm	9 Nov 2004 21:01:15 -0000	1.39
  @@ -771,7 +771,6 @@
       }
   
       my $link_title = $self->get_comment_digest($line, $filenumber, $new);
  -    $link_title =~ s/\"/"/mg;
       my $js_title = $link_title;
       $js_title =~ s/\'/\\\'/mg;
       my $anchor = $key;
  
  
  
  
  
  Index: viewtopicproperties.html.tmpl
  ===================================================================
  RCS file: /cvsroot/codestriker/codestriker/template/en/default/viewtopicproperties.html.tmpl,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- viewtopicproperties.html.tmpl	30 Sep 2004 22:58:06 -0000	1.12
  +++ viewtopicproperties.html.tmpl	9 Nov 2004 21:01:16 -0000	1.13
  @@ -193,7 +193,7 @@
   When a topic is created, it is initialised in state \'open\'.\n
   Once a topic has been reviewed, and the code has been committed,\n
   the state should be updated to \'committed\'.  If the code\n
  -in this review is not be committed, perhaps because a\n
  +in this review is not to be committed, perhaps because a\n
   new review will superceed this one, or because it was rejected,\n
   the state should be changed to \'closed\'.\n
   \n
  @@ -202,7 +202,10 @@
   all associated bugs, as a form of tracking.\n
   \n
   The topic states are also useful as a form of filtering, when\n
  -retrieving lists of topics from the search page.
  +retrieving lists of topics from the search page.\n
  +\n
  +This topic can be superceeded by a new topic, by selecting the\n
  +state \'obsoleted\'.
   ')">(What's this?)</A></FONT>
     </td>
     <td>