Scarab commit: svn commit: r10886 - trunk: . src/conf/classes src/conf/conf src/webapp/WEB-INF/templates/screens src/webapp/WEB-INF/templates/screens/entry

Author: jhoech
Date: 2010-01-26 08:30:34-0800
New Revision: 10886

Modified:
   trunk/   (props changed)
   trunk/src/conf/classes/ScarabBundle_de.properties
   trunk/src/conf/conf/intake.xml
   trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm
   trunk/src/webapp/WEB-INF/templates/screens/entry/Wizard1.vm
   trunk/src/webapp/WEB-INF/templates/screens/entry/Wizard2.vm
   trunk/src/webapp/WEB-INF/templates/screens/entry/Wizard3.vm

Log:
MRG - Merged current changes from 0.22 branch back into trunk. Branch was in revision 10885.

Modified: trunk/src/conf/classes/ScarabBundle_de.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_de.properties?view=diff&pathrev=10886&r1=10885&r2=10886
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_de.properties	(original)
+++ trunk/src/conf/classes/ScarabBundle_de.properties	2010-01-26 08:30:34-0800
@@ -476,6 +476,7 @@
 NoUsersSelected=Es wurden keine Benutzer ausgewählt.
 NoUserAttributesInCommon=Die ausgewählten Module haben keine gemeinsamen Attribute.
 NoUsersAvailable=Es sind keine Benutzer vorhanden.
+IssueDeleted=Ticket {0} wurde gelöscht.
 
 ##Password
 ChangePassword=Kennwort ändern

Modified: trunk/src/conf/conf/intake.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/conf/intake.xml?view=diff&pathrev=10886&r1=10885&r2=10886
==============================================================================
--- trunk/src/conf/conf/intake.xml	(original)
+++ trunk/src/conf/conf/intake.xml	2010-01-26 08:30:34-0800
@@ -298,7 +298,7 @@
         <field name="UserIds" key="visids" type="int" multiValued="true"/>
         <field name="Value" key="val" type="String">
            <rule name="mask" value="^$|\S">intake_ModuleRequiresDataForAttribute</rule>
-           <rule name="maxLength" value="5000">intake_LengthMustBeLessThan5000CharactersUAttachmentOrComment</rule>
+           <rule name="maxLength" value="5000">         intake_LengthMustBeLessThan5000CharactersUAttachmentOrComment</rule><!-- Empty space is because of a bug of fulcrum-intake: SCB2997 -->
            <required-message>intake_ModuleRequiresDataForAttribute</required-message>
         </field>
         <field name="Url" key="url" type="String" mapToProperty="Value">

Modified: trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm?view=diff&pathrev=10886&r1=10885&r2=10886
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm	2010-01-26 08:30:34-0800
@@ -1,7 +1,10 @@
+#* SCB2537: Feeds for queries are currently not supported.
 #if ($scarabR.Query.QueryId)
 <link rel="alternate" type="application/rss+xml" title="RSS" href="$link.setPage('Index.vm')/action/Search/go/$scarabR.Query.QueryId/eventSubmit_doSelectquery/foo/output/feed/feedType/rss_2.0">
 <link rel="alternate" type="application/rss+xml" title="ATOM" href="$link.setPage('Index.vm')/action/Search/go/$scarabR.Query.QueryId/eventSubmit_doSelectquery/foo/output/feed/feedType/atom_0.3">
 #end
+*#
+
 #set ($mitlist = $user.CurrentMITList)
 #set ($searchType = $data.Parameters.getString('searchType', ''))
 
@@ -26,6 +29,8 @@
   #processQueryResults('' $issueListSize)
 #end
 </td>
+
+#* SCB2537: Feeds for queries are currently not supported.
 #if ($scarabR.Query.QueryId)
 <td align="right" nowrap="1">
 	<a style="align:right;" title="$l10n.SearchRSSFeed"
@@ -34,6 +39,8 @@
 	 href="$link.setPage('Index.vm')/action/Search/go	/$scarabR.Query.QueryId/eventSubmit_doSelectquery/foo/output/feed/feedType/atom_0.3"><img align="middle" src="$staticLink.setPath('/images/icon_atom.gif')" border="0" /></a>
 </td>
 #end
+*#
+
 </tr></table>
 </div>
 #end

Modified: trunk/src/webapp/WEB-INF/templates/screens/entry/Wizard1.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/entry/Wizard1.vm?view=diff&pathrev=10886&r1=10885&r2=10886
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/entry/Wizard1.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/screens/entry/Wizard1.vm	2010-01-26 08:30:34-0800
@@ -3,7 +3,7 @@
 
 <div id="wizard1" class="app">
 
-<h3>$l10n.format("NewIssue", $module.getRModuleIssueType($scarabR.CurrentIssueType).DisplayName.toLowerCase())</h3>
+<h3>$l10n.format("NewIssue", $module.getRModuleIssueType($scarabR.CurrentIssueType).DisplayName)</h3>
 
 <form method="post" name="form" action="$link.setPage("entry,Wizard1.vm").setAction("ReportIssue")">
 <input type="hidden" name="$scarabG.Constant.NEXT_TEMPLATE" value="entry,Wizard3.vm" />

Modified: trunk/src/webapp/WEB-INF/templates/screens/entry/Wizard2.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/entry/Wizard2.vm?view=diff&pathrev=10886&r1=10885&r2=10886
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/entry/Wizard2.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/screens/entry/Wizard2.vm	2010-01-26 08:30:34-0800
@@ -12,7 +12,7 @@
 <input type="hidden" name="templateId" value="$!templateId" />
 
 
-<h3>$l10n.format("NewIssue", $module.getRModuleIssueType($issueType).DisplayName.toLowerCase())</h3>
+<h3>$l10n.format("NewIssue", $module.getRModuleIssueType($issueType).DisplayName)</h3>
 
 <table width="100%" border="1" cellspacing="2" cellpadding="3">
 <tr>

Modified: trunk/src/webapp/WEB-INF/templates/screens/entry/Wizard3.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/entry/Wizard3.vm?view=diff&pathrev=10886&r1=10885&r2=10886
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/entry/Wizard3.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/screens/entry/Wizard3.vm	2010-01-26 08:30:34-0800
@@ -33,7 +33,7 @@
 
 <div class="app" id="div2-1-0">
 
-  <h3>$l10n.format("NewIssue", $rmit.DisplayName.toLowerCase())</h3>
+  <h3>$l10n.format("NewIssue", $rmit.DisplayName)</h3>
 
   <form method="post" name="form" action="$link.setPage("entry,Wizard3.vm")" enctype="multipart/form-data">
     <input type="hidden" name="action" value="ReportIssue" />

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2442164