Dev: Rename from 'object' to 'module'

application/config/internal.php

@@ -64,8 +64,8 @@
             // 'newDirMode'=>0777,
         ),
         // TODO: Include modules dynamically
-        'ArrayQuestionObject' => array(
-            'class'   => 'questions\ArrayQuestionObject\ArrayQuestionObjectModule',
+        'ArrayQuestionModule' => array(
+            'class'   => 'questions\ArrayQuestionModule\ArrayQuestionModule',
         ),
     ),
 

application/core/questions/ArrayQuestionModule/ArrayQuestionModule.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace questions\ArrayQuestionModule;
+
+// TODO: Auto-include
+\Yii::import('application.core.questions.common.*');
+
+/**
+ * 
+ */
+class ArrayQuestionModule extends \QuestionModule
+{
+    /**
+     * @todo Init automatically
+     * @var string
+     */
+    public $controllerNamespace = 'questions\ArrayQuestionModule';
+
+    /**
+     * 
+     * @return 
+     */
+    public function init()
+    {
+    }
+}

application/core/questions/ArrayQuestionObject/config.json → application/core/questions/ArrayQuestionModule/config.json

@@ -1,5 +1,5 @@
 {
-    "name": "Array question module",
+    "name": "ArrayQuestionModule",
     "description": "Some description of question module",
     "version": "1.0.0",
 

application/core/questions/ArrayQuestionObject/controllers/AdminController.php → application/core/questions/ArrayQuestionModule/controllers/AdminController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace questions\ArrayQuestionObject;
+namespace questions\ArrayQuestionModule;
 
 // TODO: Auto-include
 \Yii::import('application.core.questions.common.controllers.*');
@@ -15,10 +15,22 @@ class AdminController extends \AdminBaseController
      * @param int $surveyId
      * @param int $qid
      * @param int $gid
-     * @return 
+     * @return void
      */
     public function actionView($surveyId, $gid, $qid)
     {
         $this->renderSidebody($surveyId, $gid, $qid);
     }
+
+    /**
+     * Edit question view
+     * @param int $surveyId
+     * @param int $qid
+     * @param int $gid
+     * @return void
+     */
+    public function actionEdit($surveyId, $gid, $qid)
+    {
+        echo 'here';
+    }
 }

application/core/questions/ArrayQuestionObject/ArrayQuestionObject.php → application/core/questions/ArrayQuestionModule/models/ArrayQuestion.php

@@ -3,11 +3,11 @@
 Yii::import('application.core.questions.QuestionObjectBase', true);
 
 /**
- * Basic array question type
+ * Basic array question model
  * @since 2016-10-06
  * @author Olle Haerstedt
  */
-class ArrayQuestionObject extends QuestionObjectBase
+class ArrayQuestion extends QuestionObjectBase
 {
     /**
      * @return 
@@ -39,7 +39,7 @@ public function getFieldMap($fieldname)
                 'other' => 'N',
                 'help' => 'question help',
                 'type' => '?',
-                'extended_type' => 'ArrayQuestionObject',
+                'extended_type' => 'ArrayQuestionModule',
                 'database' => 'string(5)'
             );
         }

application/core/questions/common/controllers/AdminBaseController.php

@@ -64,6 +64,17 @@ public function renderSidebody($surveyId, $gid, $qid, $content = null)
         $aData['showEditDefaultAnswers'] = $config->haveDefaultAnswers;
         $aData['questionTypeDescription'] = $config->description;
 
+        // Reflection class needed to get module name
+        $r = new ReflectionClass($this->module);
+        $aData['editUrl'] = $this->createUrl(
+            $r->getShortName() . '/admin/edit',
+            array(
+                'surveyId' => $surveyId,
+                'gid' => $gid,
+                'qid' => $qid
+            )
+        );
+
         $qshowstyle = "";
 
         $aData['qshowstyle'] = $qshowstyle;

application/helpers/QuestionObjectHelper.php

@@ -109,7 +109,8 @@ public static function getAttributeNames($extendedType)
      */
     private static function getInstance($extendedType)
     {
-        $file = '/core/questions/' . $extendedType . '/' . $extendedType . '.php';
+        $modelFile = str_replace('Module', '', $extendedType);
+        $file = '/core/questions/' . $extendedType . '/models/' . $modelFile . '.php';
         $fullFilePath = \Yii::app()->basePath . $file;
 
         $fileExists = file_exists($fullFilePath);
@@ -120,7 +121,7 @@ private static function getInstance($extendedType)
 
         require_once(\Yii::app()->basePath . $file);
 
-        $m = new \ReflectionMethod($extendedType, 'getInstance');
+        $m = new \ReflectionMethod($modelFile, 'getInstance');
         return $m->invoke(null);
     }
 
@@ -151,9 +152,11 @@ public static function redirectQuestionView($surveyId, \Question $question)
      */
     public static function updateControllerMap(\CWebApplication $app)
     {
+        /*
         $app->controllerMap = array(
-            'ArrayQuestionObjectAdminController' => 'application.core.questions.ArrayQuestionObject.ArrayQuestionObjectAdminController',
+            'ArrayQuestionObjectAdminController' => 'application.core.questions.ArrayQuestionModule.ArrayQuestionObjectAdminController',
             'TestQuestionObjectAdminController' => 'application.core.questions.TestQuestionObject.TestQuestionObjectAdminController'
         );
+         */
     }
 }

application/views/admin/survey/Question/questionbar_view.php

@@ -104,7 +104,7 @@
 
             <!-- Edit button -->
             <?php if(Permission::model()->hasSurveyPermission($surveyid,'surveycontent','update')): ?>
-                <a class="btn btn-default" href='<?php echo $this->createUrl("/admin/questions/sa/editquestion/surveyid/".$surveyid."/gid/".$gid."/qid/".$qid); ?>' role="button">
+                <a class="btn btn-default" href='<?php echo $editUrl; ?>' role="button">
                     <span class="icon-edit"></span>
                     <?php eT("Edit");?>
                 </a>