[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-server-cvs
Subject:    [Server-cvs] admin/web/src/srvprxy config_mpeg2ts.html.wasm, 1.12.2.6, 1.12.2.7
From:       yijil () helixcommunity ! org
Date:       2013-01-30 9:07:20
[Download RAW message or body]

Update of /cvsroot/server/admin/web/src/srvprxy
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv11552/src/srvprxy

Modified Files:
      Tag: SERVER_15_0
	config_mpeg2ts.html.wasm 
Log Message:
Committed to: SERVER_15_0_RN, HEAD

Reviewed by: Xiaocheng

Synopsis: 
===============
Fix HLXSRV-94 [BuyDRM]At HLS setup page, at 'Segment Encryption' should 'None' \
position before 'Buy DRM'

Branch: SERVER_15_0_RN, HEAD

Suggested Reviewers: Anyone

Description: 
===============

At HLS setup page, at 'Segment Encryption' should 'None' position before 'Buy DRM The \
menu list is: None     <===  This one should be first position
...
Buy DRM
...
My Fix:
Change "buydrm" to "helixbuydrm"

Files affected:
===============
server/admin/web/build/mserver/config_mpeg2ts.html
server/admin/web/build/server/config_mpeg2ts.html
server/admin/web/src/srvprxy/config_mpeg2ts.html.wasm
server_rn/common/util/pub/mpeg2ts_config_names.h
server_rn/datatype/mpeg2ts/streamhandler.cpp

Testing Performed: 
===============
Integration Tests:
N/A

Performance Tests: 
N/A

QA Hints
========
None.



Index: config_mpeg2ts.html.wasm
===================================================================
RCS file: /cvsroot/server/admin/web/src/srvprxy/config_mpeg2ts.html.wasm,v
retrieving revision 1.12.2.6
retrieving revision 1.12.2.7
diff -u -d -r1.12.2.6 -r1.12.2.7
--- config_mpeg2ts.html.wasm	26 Jan 2013 09:59:43 -0000	1.12.2.6
+++ config_mpeg2ts.html.wasm	30 Jan 2013 09:07:07 -0000	1.12.2.7
@@ -331,7 +331,7 @@
 {
     if (controls.name == "MPEG2-TS_Output.Encryption")
     {
-        if (controls.value == "aes128" || controls.value == "buydrm")
+        if (controls.value == "aes128" || controls.value == "helixbuydrm")
         {
             theForm["MPEG2-TS_Output.KeyFileWriteLocation"].disabled = false;
             theForm["MPEG2-TS_Output.KeyFileInterval"].disabled = false;
@@ -478,7 +478,7 @@
                                                 {"none" => "None"
                                                  , "aes128" => "AES128"
                                                  , "vcas" => "Verimatrix DRM"
-                                                 , "buydrm" => "Buy DRM"},  
+                                                 , "helixbuydrm" => "Buy DRM"},  
                                 name => "MPEG2-TS_Output.Encryption", onchange => \
"EnableDisableControls(this)"); @>  <BR><BR>
         <@= formElemSelect( "Verimatrix DRM Resouce Node", 


_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs


[prev in list] [next in list] [prev in thread] [next in thread]