Browse Source

Fix CMS errors

jmontoyaa 9 years ago
parent
commit
a0353e3bf5

+ 28 - 28
app/config/sonata/sonata_admin.yml

@@ -87,9 +87,9 @@ sonata_admin:
                 label_catalogue: SonataAdminBundle
                 #icon:            '<i class="fa fa-cogs"></i>'
                 items:
-                    - sonata.notification.admin.message
-                    - sonata.admin.settings_current
-                    - sonata.admin.tool
+#                    - sonata.notification.admin.message
+#                    - sonata.admin.settings_current
+#                    - sonata.admin.tool
             sonata.admin.group.user:
                 label: Users
                 #icon:  '<i class="fa fa-play-circle"></i>'
@@ -100,31 +100,31 @@ sonata_admin:
 #                    - sonata.admin.user_group
 #                    - sonata.admin.user_field
 #                    - sonata.admin.user_field_values
-            sonata.admin.group.course:
-                label: Courses
-                #icon:  '<i class="fa fa-play-circle"></i>'
-                label_catalogue: SonataAdminBundle
-                items:
-#                    - sonata.admin.course
-                    - sonata.admin.course_category
-                    - sonata.admin.course_request
-                    - sonata.admin.c_group_info
-#                    - sonata.admin.notebook
-            sonata.admin.group.session:
-                  label: Sessions
-                  #icon:  '<i class="fa fa-play-circle"></i>'
-                  label_catalogue: SonataAdminBundle
-                  items:
-                      - sonata.admin.session
-                      - sonata.admin.session_category
-                      - sonata.admin.career
-                      - sonata.admin.promotion
-            sonata.admin.group.url:
-                  label: URLs
-                  #icon:  '<i class="fa fa-play-circle"></i>'
-                  label_catalogue: SonataAdminBundle
-                  items:
-                      - sonata.admin.access_url
+#            sonata.admin.group.course:
+#                label: Courses
+#                #icon:  '<i class="fa fa-play-circle"></i>'
+#                label_catalogue: SonataAdminBundle
+#                items:
+##                    - sonata.admin.course
+#                    - sonata.admin.course_category
+#                    - sonata.admin.course_request
+#                    - sonata.admin.c_group_info
+##                    - sonata.admin.notebook
+#            sonata.admin.group.session:
+#                  label: Sessions
+#                  #icon:  '<i class="fa fa-play-circle"></i>'
+#                  label_catalogue: SonataAdminBundle
+#                  items:
+#                      - sonata.admin.session
+#                      - sonata.admin.session_category
+#                      - sonata.admin.career
+#                      - sonata.admin.promotion
+#            sonata.admin.group.url:
+#                  label: URLs
+#                  #icon:  '<i class="fa fa-play-circle"></i>'
+#                  label_catalogue: SonataAdminBundle
+#                  items:
+#                      - sonata.admin.access_url
 
     assets:
         stylesheets:

+ 7 - 0
main/admin/index.php

@@ -237,6 +237,13 @@ if (api_is_platform_admin()) {
         'label' => get_lang('TeacherTimeReport')
     );
 
+    if (api_get_configuration_value('chamilo_cms')) {
+        $items[] = array(
+            'url' => api_get_path(WEB_PATH) . 'web/app_dev.php/administration',
+            'label' => get_lang('CMS')
+        );
+    }
+
     /* Event settings */
 
     if (api_get_setting('activate_email_template') == 'true') {

+ 3 - 1
main/install/index.php

@@ -901,7 +901,9 @@ if (@$_POST['step2']) {
         $connection->executeQuery("ALTER TABLE timeline__action_component ADD CONSTRAINT FK_6ACD1B169D32F035 FOREIGN KEY (action_id) REFERENCES timeline__action (id) ON DELETE CASCADE;");
         $connection->executeQuery("ALTER TABLE timeline__action_component ADD CONSTRAINT FK_6ACD1B16E2ABAFFF FOREIGN KEY (component_id) REFERENCES timeline__component (id) ON DELETE CASCADE;");
         //$connection->executeQuery("CREATE UNIQUE INDEX UNIQ_8D93D649A0D96FBF ON user (email_canonical);");
-
+        $connection->executeQuery("ALTER TABLE fos_group ADD name VARCHAR(255) NOT NULL;");
+        $connection->executeQuery("ALTER TABLE fos_group ADD roles LONGTEXT NOT NULL COMMENT '(DC2Type:array)'");
+        
         $sysPath = api_get_path(SYS_PATH);
 
         finishInstallation(

+ 16 - 16
src/Chamilo/UserBundle/Admin/UserAdmin.php

@@ -23,7 +23,7 @@ class UserAdmin extends BaseUserAdmin
             ->tab('User')
             ->with('Profile', array('class' => 'col-md-6'))->end()
             ->with('General', array('class' => 'col-md-6'))->end()
-            ->with('Social', array('class' => 'col-md-6'))->end()
+            //->with('Social', array('class' => 'col-md-6'))->end()
             ->end()
             ->tab('Security')
             ->with('Status', array('class' => 'col-md-4'))->end()
@@ -42,7 +42,7 @@ class UserAdmin extends BaseUserAdmin
             ->with('General')
             ->add('username')
             ->add('email')
-            ->add(
+            /*->add(
                 'plainPassword',
                 'text',
                 array(
@@ -50,10 +50,10 @@ class UserAdmin extends BaseUserAdmin
                             $this->getSubject()->getId()
                         )),
                 )
-            )
+            )*/
             ->end()
             ->with('Profile')
-            ->add(
+            /*->add(
                 'dateOfBirth',
                 'sonata_type_date_picker',
                 array(
@@ -62,31 +62,31 @@ class UserAdmin extends BaseUserAdmin
                     'dp_max_date' => $now->format('c'),
                     'required' => false,
                 )
-            )
+            )*/
             ->add('firstname', null, array('required' => false))
             ->add('lastname', null, array('required' => false))
-            ->add('website', 'url', array('required' => false))
-            ->add('biography', 'text', array('required' => false))
-            ->add(
+            //->add('website', 'url', array('required' => false))
+            //->add('biography', 'text', array('required' => false))
+            /*->add(
                 'gender',
                 'sonata_user_gender',
                 array(
                     'required' => true,
                     'translation_domain' => $this->getTranslationDomain(),
                 )
-            )
-            ->add('locale', 'locale', array('required' => false))
-            ->add('timezone', 'timezone', array('required' => false))
-            ->add('phone', null, array('required' => false))
+            )*/
+            //->add('locale', 'locale', array('required' => false))
+            //->add('timezone', 'timezone', array('required' => false))
+            //->add('phone', null, array('required' => false))
             ->end()
-            ->with('Social')
+            /*->with('Social')
             ->add('facebookUid', null, array('required' => false))
             ->add('facebookName', null, array('required' => false))
             ->add('twitterUid', null, array('required' => false))
             ->add('twitterName', null, array('required' => false))
             ->add('gplusUid', null, array('required' => false))
             ->add('gplusName', null, array('required' => false))
-            ->end()
+            ->end()*/
             ->end();
 
         if ($this->getSubject() && !$this->getSubject()->hasRole(
@@ -127,13 +127,13 @@ class UserAdmin extends BaseUserAdmin
                 ->end();
         }
 
-        $formMapper
+        /*$formMapper
             ->tab('Security')
             ->with('Keys')
             ->add('token', null, array('required' => false))
             ->add('twoStepVerificationCode', null, array('required' => false))
             ->end()
-            ->end();
+            ->end();*/
 //
 //        $formMapper
 //            ->tab('ExtraFields')

+ 1 - 1
src/Chamilo/UserBundle/Entity/Group.php

@@ -32,7 +32,7 @@ class Group extends BaseGroup
      * @var string
      * @ORM\Column(name="code", type="string", length=40, nullable=false, unique=true)
      */
-    private $code;
+    protected $code;
 
     /**
      * Get id

+ 1 - 1
src/Chamilo/UserBundle/Entity/User.php

@@ -2102,7 +2102,7 @@ class User implements UserInterface //implements ParticipantInterface, ThemeUser
 
     public function getPlainPassword()
     {
-        return $this->plainPassword;
+        //return $this->plainPassword;
     }
 
       /**