Update ng templates for HTML comments, description

n.b. this disables the expandable/collapsable description pane (inc. truncation). Bug # 13560 Signed-off-by: Alex Coles <[email protected]>
opf · Jul 10, 2014 · 3cbeb85 · 3cbeb85
1 parent 8eb1322
commit 3cbeb85
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/public/templates/work_packages/tabs/_user_activity.html b/public/templates/work_packages/tabs/_user_activity.html
@@ -5,7 +5,9 @@
   <span class="user"><a ng-href="{{ userPath(activity.props.userId) }}" name="{{ currentAnchor }}" ng-bind="activity.props.userName"></a></span>
   <span class="date">commented on <span ng-bind="activity.props.createdAt | date:'short'"/></span>
   <span class="comment">
-    <span class="message" ng-show="activity.props._type == 'Activity::Comment'">{{ activity.props.comment }}</span>
+    <span class="message"
+      ng-show="activity.props._type == 'Activity::Comment'"
+      ng-bind-html="activity.props.comment"/>
     <ul class="work-package-details-activities-messages">
       <li ng-repeat="detail in activity.props.htmlDetails track by $index">
         <span class="message" ng-bind-html="detail"/>

diff --git a/public/templates/work_packages/tabs/overview.html b/public/templates/work_packages/tabs/overview.html
@@ -1,19 +1,10 @@
 <div class="detail-panel-description">
 
   <h3>Description</h3>
+
   <div class="detail-panel-description-content">
-    <p>
-      <span ng-bind="workPackage.props.description | characters: maxDescriptionLength"
-            ng-show="toggleStates.hideFullDescription"/>
-      <span ng-bind="workPackage.props.description"
-            ng-hide="toggleStates.hideFullDescription"/>
-    </p>
+    <span ng-bind-html="workPackage.props.description"/>
   </div>
-  <panel-expander ng-if="workPackage.props.description.length > maxDescriptionLength"
-                  collapsed="toggleStates.hideFullDescription"
-                  expand-text="Show full description"
-                  collapse-text="Hide full description">
-  </panel-expander>
 </div>