Fixes #175. A warning message is displayed when a conference nouns is…

… added and recording is enabled.
RestComm · Jan 23, 2015 · 2a39f88 · 2a39f88
1 parent 0045918
commit 2a39f88
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 7 deletions.
diff --git a/restcomm/restcomm.rvd/src/main/webapp/css/rvd.css b/restcomm/restcomm.rvd/src/main/webapp/css/rvd.css
@@ -36,6 +36,12 @@ label {
 	font-style: italic;
 }
 
+.validation-warning, .error-message {
+	font-size: 85%;
+	color: #FFA500;
+	font-style: italic;
+}
+
 
 .navbar-rvd-centered {
 	float: none;

diff --git a/restcomm/restcomm.rvd/src/main/webapp/js/controllers/designer.js b/restcomm/restcomm.rvd/src/main/webapp/js/controllers/designer.js
@@ -111,6 +111,16 @@ var designerCtrl = App.controller('designerCtrl', function($scope, $q, $routePar
 	$scope.addUssdCollectMapping = function (collectStep) {
 		collectStep.menu.mappings.push({digits:"", next:""});
 	}	
+	// returns the number of conference nounds contained in the dial
+	$scope.dialContainsConference = function (dialstep) {
+		var count = 0;
+		for (var i=0; i<dialstep.dialNouns.length; i++) {
+			var noun = dialstep.dialNouns[i];
+			if (noun.dialType == "conference")
+				count ++;
+		}
+		return count;
+	}
 
 
 
@@ -406,8 +416,7 @@ var designerCtrl = App.controller('designerCtrl', function($scope, $q, $routePar
 
 	$scope.removeNestedMessage = function (step,nested) {
 		step.messages.splice( step.messages.indexOf(nested), 1 );
-	}
-
+	}	
 
 
 

diff --git a/restcomm/restcomm.rvd/src/main/webapp/templates/steps/dialStep.html b/restcomm/restcomm.rvd/src/main/webapp/templates/steps/dialStep.html
@@ -136,11 +136,16 @@
 			</div>	
 
 			<div class='row'>
-				<div  class="col-md-12 input-group form-group">
-					<span class="input-group-addon">Recording</span>
-					<select ng-model='step.record' auto-clear ng-options='pair.value as pair.caption for pair in yesNoBooleanOptions' class="form-control">
-						<option value=''></option>
-					</select>					
+				<div  class="col-md-12 form-group">
+					<div class="input-group">
+						<span class="input-group-addon">Recording</span>
+						<select ng-model='step.record' auto-clear ng-options='pair.value as pair.caption for pair in yesNoBooleanOptions' class="form-control">
+							<option value=''></option>
+						</select>					
+					</div>
+					<div>
+						<div class="validation-warning" ng-show="step.record==true && dialContainsConference(step)">Recording for Conference is not supported yet</div>
+					</div>
 				</div>
 			</div>
 </div>