浏览代码

Admin config. i18n. Parameters updated

Guillermo Espinoza 7 年之前
父节点
当前提交
c3be58ae3b

+ 2 - 1
app/Resources/translations/messages.es.yml

@@ -2,4 +2,5 @@ Cablemodem: Cablemodem
 Node: Nodo
 Profile: Perfil
 CablemodemModel: Modelo Cablemodem
-CMTSModel: Modelo CMTS
+CMTSModel: Modelo CMTS
+CMTS: CMTS

+ 63 - 43
app/Resources/workflows/workflow_list.yml.dist

@@ -1,43 +1,63 @@
-#framework:
-#  workflows:
-#    olt_workflow:
-#      type: state_machine
-#      marking_store:
-#        type: single_state
-#        arguments:
-#          - currentState
-#      supports:
-#        - RadiusBundle\Entity\OLT
-#      initial_place: disabled
-#      places:
-#        - enabled
-#        - disabled
-#      transitions:
-#        disable:
-#          from: enabled
-#          to: disabled
-#        enable:
-#          from: disabled
-#          to: enabled
-#    onu_workflow:
-#      type: state_machine
-#      marking_store:
-#        type: single_state
-#        arguments:
-#          - currentState
-#      supports:
-#        - RadiusBundle\Entity\ONU
-#      initial_place: active
-#      places:
-#        - active
-#        - disable
-#      transitions:
-#        add_config:
-#          from: active
-#          to: active
-#        disable:
-#          from: active
-#          to: disable
-#        active:
-#          from: disable
-#          to: active
+framework:
+    workflows:
+        administrative_state:
+            type: 'state_machine'
+            marking_store:
+                type: 'single_state'
+                arguments:
+                    - 'administrativeState'
+            supports:
+                - CablemodemBundle\Entity\Cablemodem
+            places:
+                - active
+                - pre_notice
+                - suspend
+                - deleted
+            transitions:
+                active_to_pre_notice:
+                    from: active
+                    to:   pre_notice
+                active_to_suspend:
+                    from: active
+                    to:   suspend
+                pre_notice_to_active:
+                    from: pre_notice
+                    to:   active
+                pre_notice_to_suspend:
+                    from: pre_notice
+                    to:   suspend
+                suspend_to_active:
+                    from: suspend
+                    to:   active 
+                delete:
+                    from: [active,suspend,pre_notice]
+                    to:   deleted
+        transition_state:
+            type: 'state_machine'
+            marking_store:
+                type: 'single_state'
+                arguments:
+                    - 'transitionState'
+            supports:
+                - CablemodemBundle\Entity\Cablemodem
+            places:
+                - pending
+                - process
+                - fail
+                - success
+            transitions:
+                pending_to_process:
+                    from: pending
+                    to:   process
+                process_to_fail:
+                    from: process
+                    to:   fail
+                process_to_success:
+                    from: process
+                    to:   success
+                fail_to_pending:
+                    from: fail
+                    to:   pending
+                success_to_pending:
+                    from: success
+                    to:   pending

+ 6 - 1
app/config/config.yml

@@ -122,4 +122,9 @@ doctrine_migrations:
     namespace: Application\Migrations
     table_name: migration_versions
     name: Application Migrations
-    organize_migrations: false # Version >=1.2 Possible values are: "BY_YEAR", "BY_YEAR_AND_MONTH", false
+    organize_migrations: false # Version >=1.2 Possible values are: "BY_YEAR", "BY_YEAR_AND_MONTH", false
+    
+stof_doctrine_extensions:
+    orm:
+        default:
+            timestampable: true    

+ 3 - 1
app/config/parameters.yml.dist

@@ -37,4 +37,6 @@ parameters:
     env(CLIENT): ''
     cookie_domain_client: '%env(CLIENT)%'
     cookie_domain: '%cookie_domain_client%.fd3.flowdat.com'
-    session_names: [flowdat_base_session, flowdat_ftth_session, flowdat_mapas_session, flowdat_stats_session, flowdat_radius_session, flowdat_cablemodem_session]
+    session_names: [flowdat_base_session, flowdat_ftth_session, flowdat_mapas_session, flowdat_stats_session, flowdat_radius_session, flowdat_cablemodem_session]
+    
+    nginx_name: nginx-proxy

+ 3 - 1
app/config/parameters.yml.docker

@@ -37,4 +37,6 @@ parameters:
 
     cookie_domain_client: '%env(CLIENT)%'
     cookie_domain: '%cookie_domain_client%.flowdat.com'
-    session_names: [flowdat_base_session, flowdat_ftth_session, flowdat_mapas_session, flowdat_stats_session, flowdat_radius_session, flowdat_cablemodem_session]
+    session_names: [flowdat_base_session, flowdat_ftth_session, flowdat_mapas_session, flowdat_stats_session, flowdat_radius_session, flowdat_cablemodem_session]
+    
+    nginx_name: nginx-proxy

+ 4 - 1
app/config/security.yml

@@ -14,11 +14,14 @@ security:
             security: false
             
         api:
+          context: ik_share
           pattern: ^/api
-          stateless: true
+          stateless: false
           oauth_proxy: true
 
         secured_area:
+            context: ik_share
+            stateless: false
             pattern: ^/
             logout:
                 path:   /logout

+ 19 - 1
src/CablemodemBundle/Resources/config/services.yml

@@ -34,4 +34,22 @@ services:
             - { name: sonata.admin, manager_type: orm, group: Cablemodem, label: CMTSModel, label_catalogue: CablemodemBundle, label_translator_strategy: sonata.admin.label.strategy.underscore }
         calls:    
             - [setTranslationDomain, [CablemodemBundle]]
-        public: true
+        public: true
+
+    cablemodem.admin.cmts:
+        class: CablemodemBundle\Admin\CMTSAdmin
+        arguments: [~, CablemodemBundle\Entity\CMTS, BaseAdminBundle:CRUD]
+        tags:
+            - { name: sonata.admin, manager_type: orm, group: Cablemodem, label: CMTS, label_catalogue: CablemodemBundle, label_translator_strategy: sonata.admin.label.strategy.underscore }
+        calls:    
+            - [setTranslationDomain, [CablemodemBundle]]
+        public: true
+
+    cablemodem.admin.cablemodem:
+        class: CablemodemBundle\Admin\CablemodemAdmin
+        arguments: [~, CablemodemBundle\Entity\Cablemodem, WorkflowBundle:CRUD]
+        tags:
+            - { name: sonata.admin, manager_type: orm, group: Cablemodem, label: Cablemodem, label_catalogue: CablemodemBundle, label_translator_strategy: sonata.admin.label.strategy.underscore }
+        calls:    
+            - [setTranslationDomain, [CablemodemBundle]]
+        public: true

+ 36 - 1
src/CablemodemBundle/Resources/translations/CablemodemBundle.es.yml

@@ -1,13 +1,18 @@
+'': ''
+default: Default
 Cablemodem: Cablemodem
 Node: Nodo
 Profile: Perfil
 CablemodemModel: Modelo Cablemodem
 CMTSModel: Modelo CMTS
+CMTS: CMTS
 breadcrumb:
     link_node_list: Listado Nodos
     link_profile_list: Listado Perfiles
     link_cablemodem_model_list: Listado Modelos Cablemodem
     link_c_m_t_s_model_list: Listado Modelos CMTS
+    link_cablemodem_list: Listado Cablemodem
+    link_c_m_t_s_list: Listado CMTS
 filter:
     label_name: Nombre
     label_downstream: Downstream
@@ -15,6 +20,13 @@ filter:
     label_filtro_upload: Filtro upload
     label_filtro_download: Filtro download
     label_max_cpe: Max cpe
+    label_client_id: Cliente
+    label_mac: Mac
+    label_activation_code: Código activación    
+    label_host: Host
+    label_snmp_comunity: SNMP Comunity
+    label_snmp_version: SNMP Version
+    label_execute_snmp: Execute SNMP
 form:
     label_name: Nombre
     label_parent: Padre
@@ -23,6 +35,13 @@ form:
     label_filtro_upload: Filtro upload
     label_filtro_download: Filtro download
     label_max_cpe: Max cpe
+    label_client_id: Cliente
+    label_mac: Mac
+    label_activation_code: Código activación
+    label_host: Host
+    label_snmp_comunity: SNMP Comunity
+    label_snmp_version: SNMP Version
+    label_execute_snmp: Execute SNMP
 list:
     label_id: Id
     label_name: Nombre
@@ -33,6 +52,14 @@ list:
     label_filtro_upload: Filtro upload
     label_filtro_download: Filtro download
     label_max_cpe: Max cpe
+    label_client_id: Cliente
+    label_mac: Mac
+    label_activation_code: Código activación
+    label_current_state: Estado
+    label_host: Host
+    label_snmp_comunity: SNMP Comunity
+    label_snmp_version: SNMP Version
+    label_execute_snmp: Execute SNMP
 show:
     label_id: Id
     label_name: Nombre
@@ -41,4 +68,12 @@ show:
     label_upstream: Upstream
     label_filtro_upload: Filtro upload
     label_filtro_download: Filtro download
-    label_max_cpe: Max cpe
+    label_max_cpe: Max cpe
+    label_client_id: Cliente
+    label_mac: Mac
+    label_activation_code: Código activación
+    label_current_state: Estado
+    label_host: Host
+    label_snmp_comunity: SNMP Comunity
+    label_snmp_version: SNMP Version
+    label_execute_snmp: Execute SNMP