Load sample organization with custom data/fields

Make the organization page happy!

include/class.i18n.php

@@ -47,26 +47,30 @@ class Internationalization {
     function loadDefaultData() {
         # notrans -- do not translate the contents of this array
         $models = array(
-            'department.yaml' =>    'Dept',
-            'sla.yaml' =>           'SLA',
-            'form.yaml' =>          'DynamicForm',
+            'department.yaml' =>    'Dept::create',
+            'sla.yaml' =>           'SLA::create',
+            'form.yaml' =>          'DynamicForm::create',
             // Note that department, sla, and forms are required for
             // help_topic
-            'help_topic.yaml' =>    'Topic',
-            'filter.yaml' =>        'Filter',
-            'team.yaml' =>          'Team',
+            'help_topic.yaml' =>    'Topic::create',
+            'filter.yaml' =>        'Filter::create',
+            'team.yaml' =>          'Team::create',
+            // Organization
+            'organization.yaml' =>  'Organization::__create',
             // Note that group requires department
-            'group.yaml' =>         'Group',
-            'file.yaml' =>          'AttachmentFile',
+            'group.yaml' =>         'Group::create',
+            'file.yaml' =>          'AttachmentFile::create',
         );
 
         $errors = array();
-        foreach ($models as $yaml=>$m)
-            if ($objects = $this->getTemplate($yaml)->getData())
-                foreach ($objects as $o)
-                    // Model::create($o)
-                    call_user_func_array(
-                        array($m, 'create'), array($o, &$errors));
+        foreach ($models as $yaml=>$m) {
+            if ($objects = $this->getTemplate($yaml)->getData()) {
+                foreach ($objects as $o) {
+                    if ($m && is_callable($m))
+                        @call_user_func_array($m, array($o, &$errors));
+                }
+            }
+        }
 
         // Priorities
         $priorities = $this->getTemplate('priority.yaml')->getData();

include/class.organization.php

@@ -102,7 +102,7 @@ class Organization extends OrganizationModel {
 
     function addDynamicData($data) {
 
-        $of = OrganizationForm::getInstance($this->id);
+        $of = OrganizationForm::getInstance($this->id, true);
         foreach ($of->getFields() as $f)
             if (isset($data[$f->get('name')]))
                 $of->setAnswer($f->get('name'), $data[$f->get('name')]);
@@ -116,7 +116,7 @@ class Organization extends OrganizationModel {
         if (!isset($this->_entries)) {
             $this->_entries = DynamicFormEntry::forOrganization($this->id)->all();
             if (!$this->_entries) {
-                $g = OrganizationForm::getInstance($this->id);
+                $g = OrganizationForm::getInstance($this->id, true);
                 $g->save();
                 $this->_entries[] = $g;
             }
@@ -321,6 +321,19 @@ class Organization extends OrganizationModel {
         return $valid ? self::fromVars($form->getClean()) : null;
     }
 
+    // Custom create called by installer/upgrader to load initial data
+    static function __create($ht, &$error=false) {
+
+        $ht['created'] = new SqlFunction('NOW');
+        $org = Organization::create($ht);
+        // Add dynamic data (if any)
+        if ($ht['fields']) {
+            $org->save(true);
+            $org->addDynamicData($ht['fields']);
+        }
+
+        return $org;
+    }
 }
 
 class OrganizationForm extends DynamicForm {
@@ -343,8 +356,8 @@ class OrganizationForm extends DynamicForm {
         return static::$form;
     }
 
-    static function getInstance($object_id=0) {
-        if (!isset(static::$instance))
+    static function getInstance($object_id=0, $new=false) {
+        if ($new || !isset(static::$instance))
             static::$instance = static::getDefaultForm()->instanciate();
 
         static::$instance->object_type = 'O';
@@ -368,7 +381,13 @@ class OrganizationForm extends DynamicForm {
             }
         }
 
-        $o =static::objects();
+        if (!$form || !($o=static::objects()))
+            return false;
+
+        // Create sample organization.
+        if (($orgs = $i18n->getTemplate('organization.yaml')->getData()))
+            foreach($orgs as $org)
+                Organization::__create($org);
 
         return $o[0];
     }

include/i18n/en_US/organization.yaml

+#
+# Initial organizations defined for the system.
+#
+# Fields:
+# name - Descriptive name for the organization
+# fields - custom fields
+#
+---
+- name: osTicket
+  fields:
+    address:|
+        420 Desoto Street
+        Alexandria, LA 71301
+    phone: (318) 290-3674
+    website: http://osticket.com
+    notes: >
+        Not only do we develop the software, we also use it to manage
+        support for osTicket. Let us help you quickly implement and leverage
+        the full potential of osTicket's features and functionality. Contact
+        us for professional support or visit our website for documentation
+        and community support.

scp/js/tips.js

@@ -9,7 +9,7 @@ jQuery(function() {
             var tip_box = $('<div>').addClass('tip_box');
             var tip_shadow = $('<div>').addClass('tip_shadow');
             var tip_content = $('<div>').addClass('tip_content').load(url, function() {
-                tip_content.prepend('<a href="#" class="tip_close">x</a>');
+                tip_content.prepend('<a href="#" class="tip_close"><i class="icon-remove-circle"></i></a>');
             });
 
             var the_tip = tip_box.append(tip_arrow).append(tip_content).prepend(tip_shadow);

setup/inc/class.installer.php

@@ -259,7 +259,14 @@ class Installer extends SetupWizard {
         $errors = array();
         $ticket_vars = $i18n->getTemplate('templates/ticket/installed.yaml')
             ->getData();
-        $tid = Ticket::create($ticket_vars, $errors, 'api', false, false);
+        $ticket = Ticket::create($ticket_vars, $errors, 'api', false, false);
+
+        if ($ticket
+                && ($org = Organization::objects()->order_by('id')->one())) {
+
+            $user=User::lookup($ticket->getOwnerId());
+            $user->setOrganization($org);
+        }
 
         //TODO: create another personalized ticket and assign to admin??
 

setup/install.php

@@ -100,8 +100,10 @@ switch(strtolower($_SESSION['ost_installer']['s'])) {
         break;
     case 'done':
         $inc='install-done.inc.php';
-        if(!$installer->config_exists())
+        if (!$installer->config_exists())
             $inc='install-prereq.inc.php';
+        else // Clear installer session
+            $_SESSION['ost_installer'] =  array();
         break;
     default:
         //Fail IF any of the old config files exists.