Merge pull request civicrm#11204 from MiyaNoctem/CRM-21360-make-open-…

…case-manageable CRM-21360: Make 'Open Case' Activity Optional
ixiam · Jan 10, 2018 · 1e3ee4b · 1e3ee4b
2 parents 4ec9326 + 1ce6a34
commit 1e3ee4b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/ang/crmCaseType.js b/ang/crmCaseType.js
@@ -288,11 +288,7 @@
     };
 
     $scope.isActivityRemovable = function(activitySet, activity) {
-      if (activitySet.name == 'standard_timeline' && activity.name == 'Open Case') {
-        return false;
-      } else {
-        return true;
-      }
+      return true;
     };
 
     $scope.isValidName = function(name) {

diff --git a/ang/crmCaseType/timelineTable.html b/ang/crmCaseType/timelineTable.html
@@ -40,9 +40,9 @@
         ui-options="{dropdownAutoWidth : true}"
         ng-model="activity.reference_activity"
         ng-options="activityType.name as activityType.label for activityType in activitySet.activityTypes"
-        ng-hide="activity.name == 'Open Case'"
-        ng-required="activity.name != 'Open Case'"
+        ng-required="activity.name != ''"
         >
+        <option value="">-- Case Start --</option>
       </select>
     </td>
     <td>
@@ -51,8 +51,7 @@
         type="text"
         ng-pattern="/^-?[0-9]*$/"
         ng-model="activity.reference_offset"
-        ng-hide="activity.name == 'Open Case'"
-        ng-required="activity.name != 'Open Case'"
+        ng-required="activity.name != ''"
         >
     </td>
     <td>
@@ -61,8 +60,7 @@
         ui-options="{dropdownAutoWidth : true}"
         ng-model="activity.reference_select"
         ng-options="key as value for (key,value) in {newest: ts('Newest'), oldest: ts('Oldest')}"
-        ng-hide="activity.name == 'Open Case'"
-        ng-required="activity.name != 'Open Case'"
+        ng-required="activity.name != ''"
         >
       </select>
     </td>