Skip to content

Commit

Permalink
Updated surveymenuentries to use plugin menu insteadd of plugin menue…
Browse files Browse the repository at this point in the history 
…ntry
  • Loading branch information
@lacrioque
lacrioque committed Dec 15, 2017
1 parent 85ac33e commit 9c1876b
Show file tree
Hide file tree
Showing 12 changed files with 53 additions and 23 deletions.
2 changes: 1 addition & 1 deletion application/config/version.php
View file
Expand Up @@ -14,7 +14,7 @@

$config['versionnumber'] = '3.0.0-RC.3'; //The current version of this branch
$config['masterversion'] = '2.67.3'; //The current masters version merged into this branch
$config['dbversionnumber'] = 329;
$config['dbversionnumber'] = 332;
$config['buildnumber'] = '';
$config['updatable'] = true;
$config['assetsversionnumber'] = '3020';
Expand Down
12 changes: 6 additions & 6 deletions application/controllers/admin/PluginHelper.php
View file
Expand Up @@ -16,18 +16,18 @@ class PluginHelper extends Survey_Common_Action
* @param string $method Name of the plugin method
* @return void
*/
public function sidebody($surveyId = 0, $plugin = '', $method = '')
public function sidebody($surveyid = 0, $plugin = '', $method = '')
{
$aData = array();

$surveyId = sanitize_int($surveyId);
$oSurvey = Survey::model()->findByPk($surveyId);
$aData['surveyid'] = $surveyId;
$surveyid = sanitize_int($surveyid);
$oSurvey = Survey::model()->findByPk($surveyid);
$aData['surveyid'] = $surveyid;

$aData['surveybar']['buttons']['view'] = true;
$aData['title_bar']['title'] = viewHelper::flatEllipsizeText($oSurvey->defaultlanguage->surveyls_title)." (".gT("ID").":".$surveyId.")";
$aData['title_bar']['title'] = viewHelper::flatEllipsizeText($oSurvey->defaultlanguage->surveyls_title)." (".gT("ID").":".$surveyid.")";

$content = $this->getContent($surveyId, $plugin, $method);
$content = $this->getContent($surveyid, $plugin, $method);

$aData['sidemenu'] = array();
$aData['sidemenu']['state'] = false;
Expand Down
29 changes: 29 additions & 0 deletions application/helpers/update/updatedb_helper.php
View file
Expand Up @@ -720,6 +720,35 @@ function db_upgrade_all($iOldDBVersion, $bSilent = false)
$oTransaction->commit();
}

if ($iOldDBVersion < 332) {
$oTransaction = $oDB->beginTransaction();
$oDB->createCommand()->insert(
'{{surveymenu}}',
array(
'parent_id' => 1,
'survey_id' => null,
'ordering' => 0,
'level' => 1,
'name' => 'pluginmenu',
'title' => 'Plugin menu',
'description' => 'Plugins menu',
'changed_at' => date('Y-m-d H:i:s'),
'changed_by' => 0,
'created_at' => date('Y-m-d H:i:s'),
'created_by' => 0
)
);
$pluginMenuId = $oDB->getLastInsertID();
$oDB->createCommand()->update('{{surveymenu_entries}}', array(
'menu_id' => $pluginMenuId,
'title' => 'Simple plugins',
'menu_title' => 'Simple plugins',
'menu_description' => 'Edit simple plugin settings',
), "name='plugins'");
$oDB->createCommand()->update('{{settings_global}}', array('stg_value'=>332), "stg_name='DBVersion'");
$oTransaction->commit();
}

} catch (Exception $e) {
Yii::app()->setConfig('Updating', false);
$oTransaction->rollback();
Expand Down
3 changes: 2 additions & 1 deletion application/models/Surveymenu.php
View file
Expand Up @@ -82,7 +82,7 @@ public static function staticAddMenu($menuArray)
$oSurveymenu->created_by = Yii::app()->user->getId();

$oSurveymenu->save();
return $oSurveymenu->getPrimaryKey();
return Surveymenu::model()->find('name=:name', [':name'=> $menuArray['name']])->id;
}

public static function staticRemoveMenu($menuName, $recursive = false)
Expand Down Expand Up @@ -341,6 +341,7 @@ public function restoreDefaults()
$headerArray = ['parent_id', 'survey_id', 'user_id', 'ordering', 'level', 'name', 'title', 'position', 'description', 'active', 'changed_at', 'changed_by', 'created_at', 'created_by'];
$oDB->createCommand()->insert("{{surveymenu}}", array_combine($headerArray, [null, null, null, 0, 0, 'mainmenu', 'Survey menu', 'side', 'Main survey menu', 1, date('Y-m-d H:i:s'), 0, date('Y-m-d H:i:s'), 0]));
$oDB->createCommand()->insert("{{surveymenu}}", array_combine($headerArray, [null, null, null, 0, 0, 'quickmenu', 'Quick menu', 'collapsed', 'Quick menu', 1, date('Y-m-d H:i:s'), 0, date('Y-m-d H:i:s'), 0]));
$oDB->createCommand()->insert("{{surveymenu}}", array_combine($headerArray, [1,NULL,NULL,0,1,'pluginmenu','Plugin menu','side','Plugin menu',1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0]));

$oTransaction->commit();
} catch (Exception $e) {
Expand Down
2 changes: 1 addition & 1 deletion application/models/SurveymenuEntries.php
View file
Expand Up @@ -531,7 +531,6 @@ public function restoreDefaults()
[1, null, 13, 'emailtemplates', 'Email templates', 'Email templates', 'Edit the templates for invitation, reminder and registration emails', 'envelope-square', 'fontawesome', '', 'admin/emailtemplates/sa/index/', '', '', '', '', 'assessments', 'read', '{"render": { "link": {"data": {"surveyid": ["survey","sid"]}}}}', '', 'en-GB', 1, date('Y-m-d H:i:s'), 0, date('Y-m-d H:i:s'), 0],
[1, null, 14, 'panelintegration', 'Edit survey panel integration', 'Panel integration', 'Define panel integrations for your survey', 'link', 'fontawesome', '', '', 'updatesurveylocalesettings', 'editLocalSettings_main_view', '/admin/survey/subview/accordion/_integration_panel', '', 'surveylocale', 'read', '{"render": {"link": { "pjaxed": false}}}', '_tabPanelIntegration', 'en-GB', 1, date('Y-m-d H:i:s'), 0, date('Y-m-d H:i:s'), 0],
[1, null, 15, 'resources', 'Add/Edit resources to the survey', 'Resources', 'Add/Edit resources to the survey', 'file', 'fontawesome', '', '', 'updatesurveylocalesettings', 'editLocalSettings_main_view', '/admin/survey/subview/accordion/_resources_panel', '', 'surveylocale', 'read', null, '_tabResourceManagement', 'en-GB', 1, date('Y-m-d H:i:s'), 0, date('Y-m-d H:i:s'), 0],
[1, null, 16, 'plugins', 'Plugin settings', 'Plugins', 'Edit plugin settings', 'plug', 'fontawesome', '', '', 'updatesurveylocalesettings', 'editLocalSettings_main_view', '/admin/survey/subview/accordion/_plugins_panel', '', 'surveysettings', 'read', null, '_pluginTabSurvey', 'en-GB', 1, date('Y-m-d H:i:s'), 0, date('Y-m-d H:i:s'), 0],
[2, null, 1, 'activateSurvey', 'Activate survey', 'Activate survey', 'Activate survey', 'play', 'fontawesome', '', 'admin/survey/sa/activate', '', '', '', '', 'surveyactivation', 'update', '{"render": {"isActive": false, "link": {"data": {"surveyid": ["survey","sid"]}}}}', '', 'en-GB', 1, date('Y-m-d H:i:s'), 0, date('Y-m-d H:i:s'), 0],
[2, null, 2, 'deactivateSurvey', 'Stop this survey', 'Stop this survey', 'Stop this survey', 'stop', 'fontawesome', '', 'admin/survey/sa/deactivate', '', '', '', '', 'surveyactivation', 'update', '{"render": {"isActive": true, "link": {"data": {"surveyid": ["survey","sid"]}}}}', '', 'en-GB', 1, date('Y-m-d H:i:s'), 0, date('Y-m-d H:i:s'), 0],
[2, null, 3, 'testSurvey', 'Go to survey', 'Go to survey', 'Go to survey', 'cog', 'fontawesome', '', 'survey/index/', '', '', '', '', '', '', '{"render": {"link": {"external": true, "data": {"sid": ["survey","sid"], "newtest": "Y", "lang": ["survey","language"]}}}}', '', 'en-GB', 1, date('Y-m-d H:i:s'), 0, date('Y-m-d H:i:s'), 0],
Expand All @@ -548,6 +547,7 @@ public function restoreDefaults()
[2, null, 14, 'responses', 'Responses', 'Responses', 'Responses', 'icon-browse', 'iconclass', '', 'admin/responses/sa/browse/', '', '', '', '', 'responses', 'read', '{"render": {"isActive": true, "link": {"data": {"surveyid": ["survey", "sid"]}}}}', '', 'en-GB', 1, date('Y-m-d H:i:s'), 0, date('Y-m-d H:i:s'), 0],
[2, null, 15, 'statistics', 'Statistics', 'Statistics', 'Statistics', 'bar-chart', 'fontawesome', '', 'admin/statistics/sa/index/', '', '', '', '', 'statistics', 'read', '{"render": {"isActive": true, "link": {"data": {"surveyid": ["survey", "sid"]}}}}', '', 'en-GB', 1, date('Y-m-d H:i:s'), 0, date('Y-m-d H:i:s'), 0],
[2, null, 16, 'reorder', 'Reorder questions/question groups', 'Reorder questions/question groups', 'Reorder questions/question groups', 'icon-organize', 'iconclass', '', 'admin/survey/sa/organize/', '', '', '', '', 'surveycontent', 'update', '{"render": {"isActive": false, "link": {"data": {"surveyid": ["survey","sid"]}}}}', '', 'en-GB', 1, date('Y-m-d H:i:s'), 0, date('Y-m-d H:i:s'), 0],
[3, null, 16, 'plugins', 'Simple plugin settings', 'Simple plugins', 'Edit simple plugin settings', 'plug', 'fontawesome', '', '', 'updatesurveylocalesettings', 'editLocalSettings_main_view', '/admin/survey/subview/accordion/_plugins_panel', '', 'surveysettings', 'read', '{"render": {"link": {"data": {"surveyid": ["survey","sid"]}}}}', '_pluginTabSurvey', 'en-GB', 1, date('Y-m-d H:i:s'), 0, date('Y-m-d H:i:s'), 0],
];

foreach ($basicMenues as $basicMenu) {
Expand Down
11 changes: 5 additions & 6 deletions assets/packages/adminpanel/build/lsadminpanel.js
View file
Expand Up @@ -37637,7 +37637,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
setActiveMenuItemIndex(menuItem) {
let activeMenuIndex = menuItem.id;
this.$store.commit('lastMenuItemOpen', menuItem);
this.$log.log('Opened Menu', menuItem);
this.$log.log('Opened Menuitem', menuItem);
return true;
},
checkIsOpen(toCheckMenu) {
Expand Down Expand Up @@ -37700,7 +37700,7 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
"id": 'sidemenu_' + _vm.menu.id + '_' + menuItem.id
},
on: {
"!click": function($event) {
"click": function($event) {
_vm.setActiveMenuItemIndex(menuItem)
}
}
Expand Down Expand Up @@ -37740,9 +37740,7 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
staticClass: "list-group-item",
class: _vm.checkIsOpen(submenu) ? 'menu-selected' : '',
on: {
"click": function($event) {
$event.stopPropagation();
$event.preventDefault();
"!click": function($event) {
_vm.setActiveMenuIndex(submenu)
}
}
Expand Down Expand Up @@ -39470,7 +39468,8 @@ const getAppState = function (userid) {
state.bottommenus = bottommenus;
},
updatePjax(state) {
$(window).trigger('pjax:refresh');
let event = new Event('pjax:refresh');
window.dispatchEvent(event);
}
}
});
Expand Down
2 changes: 1 addition & 1 deletion assets/packages/adminpanel/build/lsadminpanel.js.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/packages/adminpanel/build/lsadminpanel.min.js
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions assets/packages/adminpanel/src/components/subcomponents/_submenu.vue
View file
Expand Up @@ -26,7 +26,7 @@ export default {
setActiveMenuItemIndex(menuItem){
let activeMenuIndex = menuItem.id;
this.$store.commit('lastMenuItemOpen', menuItem);
this.$log.log('Opened Menu', menuItem);
this.$log.log('Opened Menuitem', menuItem);
return true;
},
checkIsOpen(toCheckMenu){
Expand Down Expand Up @@ -76,7 +76,7 @@ export default {
<ul class="list-group subpanel col-12" :class="'level-'+(menu.level)">
<a v-for="(menuItem, index) in sortedMenuEntries"
v-bind:key="menuItem.id"
v-on:click.capture="setActiveMenuItemIndex(menuItem)"
v-on:click="setActiveMenuItemIndex(menuItem)"
:href="menuItem.link"
:id="'sidemenu_'+menu.id+'_'+menuItem.id"
class="list-group-item"
Expand All @@ -94,7 +94,7 @@ export default {
</div>
</div>
</a>
<li v-for="(submenu, index) in menu.submenus" class="list-group-item" v-bind:key="submenu.id" v-bind:class="checkIsOpen(submenu) ? 'menu-selected' : '' " @click.stop.prevent="setActiveMenuIndex(submenu)" >
<li v-for="(submenu, index) in menu.submenus" class="list-group-item" v-bind:key="submenu.id" v-bind:class="checkIsOpen(submenu) ? 'menu-selected' : '' " @click.capture="setActiveMenuIndex(submenu)" >
<a href="#" :title="submenu.description" data-toggle="tooltip" class="ls-flex-row nowrap align-item-center align-content-center" :class="checkIsOpen(submenu) ? 'ls-space margin bottom-5' : ''">
<div class="ls-space col-sm-10 padding all-0">
<menuicon icon-type="fontawesome" icon="arrow-right"></menuicon>
Expand Down
3 changes: 2 additions & 1 deletion assets/packages/adminpanel/src/store/vuex-store.js
View file
Expand Up @@ -131,7 +131,8 @@ const getAppState = function (userid) {
state.bottommenus = bottommenus;
},
updatePjax(state) {
$(window).trigger('pjax:refresh');
let event = new Event('pjax:refresh');
window.dispatchEvent(event);
}
}
});
Expand Down
0 assets/packages/pjax/build.sh → assets/packages/pjax/compile.sh
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions installer/create-database.php
View file
Expand Up @@ -459,7 +459,7 @@ function createDatabase($oDB){
$headerArray = ['parent_id','survey_id','user_id','ordering','level','name','title','position','description','active','changed_at','changed_by','created_at','created_by'];
$oDB->createCommand()->insert("{{surveymenu}}", array_combine($headerArray, [NULL,NULL,NULL,0,0,'mainmenu','Survey menu','side','Main survey menu',1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0]));
$oDB->createCommand()->insert("{{surveymenu}}", array_combine($headerArray, [NULL,NULL,NULL,0,0,'quickmenu','Quick menu','collapsed','Quick menu',1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0]));

$oDB->createCommand()->insert("{{surveymenu}}", array_combine($headerArray, [1,NULL,NULL,0,1,'pluginmenu','Plugin menu','side','Plugin menu',1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0]));


// Surveymenu entries
Expand Down Expand Up @@ -514,7 +514,6 @@ function createDatabase($oDB){
[1,NULL,13,'emailtemplates','Email templates','Email templates','Edit the templates for invitation, reminder and registration emails','envelope-square','fontawesome','','admin/emailtemplates/sa/index/','','','','','assessments','read','{"render": { "link": {"data": {"surveyid": ["survey","sid"]}}}}','','en-GB',1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0],
[1,NULL,14,'panelintegration','Edit survey panel integration','Panel integration','Define panel integrations for your survey','link','fontawesome','','','updatesurveylocalesettings','editLocalSettings_main_view','/admin/survey/subview/accordion/_integration_panel','','surveylocale','read','{"render": {"link": { "pjaxed": false}}}','_tabPanelIntegration','en-GB',1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0],
[1,NULL,15,'resources','Add/Edit resources to the survey','Resources','Add/Edit resources to the survey','file','fontawesome','','','updatesurveylocalesettings','editLocalSettings_main_view','/admin/survey/subview/accordion/_resources_panel','','surveylocale','read',NULL,'_tabResourceManagement','en-GB',1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0],
[1,NULL,16,'plugins','Plugin settings','Plugins','Edit plugin settings','plug','fontawesome','','','updatesurveylocalesettings','editLocalSettings_main_view','/admin/survey/subview/accordion/_plugins_panel','','surveysettings','read',NULL,'_pluginTabSurvey','en-GB',1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0],
[2,NULL,1,'activateSurvey','Activate survey','Activate survey','Activate survey','play','fontawesome','','admin/survey/sa/activate','','','','','surveyactivation','update','{"render": {"isActive": false, "link": {"data": {"surveyid": ["survey","sid"]}}}}','','en-GB',1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0],
[2,NULL,2,'deactivateSurvey','Stop this survey','Stop this survey','Stop this survey','stop','fontawesome','','admin/survey/sa/deactivate','','','','','surveyactivation','update','{"render": {"isActive": true, "link": {"data": {"surveyid": ["survey","sid"]}}}}','','en-GB',1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0],
[2,NULL,3,'testSurvey','Go to survey','Go to survey','Go to survey','cog','fontawesome','','survey/index/','','','','','','','{"render": {"link": {"external": true, "data": {"sid": ["survey","sid"], "newtest": "Y", "lang": ["survey","language"]}}}}','','en-GB',1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0],
Expand All @@ -531,6 +530,7 @@ function createDatabase($oDB){
[2,NULL,14,'responses','Responses','Responses','Responses','icon-browse','iconclass','','admin/responses/sa/browse/','','','','','responses','read','{"render": {"isActive": true, "link": {"data": {"surveyid": ["survey", "sid"]}}}}','','en-GB',1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0],
[2,NULL,15,'statistics','Statistics','Statistics','Statistics','bar-chart','fontawesome','','admin/statistics/sa/index/','','','','','statistics','read','{"render": {"isActive": true, "link": {"data": {"surveyid": ["survey", "sid"]}}}}','','en-GB',1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0],
[2,NULL,16,'reorder','Reorder questions/question groups','Reorder questions/question groups','Reorder questions/question groups','icon-organize','iconclass','','admin/survey/sa/organize/','','','','','surveycontent','update','{"render": {"isActive": false, "link": {"data": {"surveyid": ["survey","sid"]}}}}','','en-GB',1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0],
[3,NULL,16,'plugins','Simple plugin settings', 'Simple plugins', 'Edit simple plugin settings','plug','fontawesome','','','updatesurveylocalesettings','editLocalSettings_main_view','/admin/survey/subview/accordion/_plugins_panel','','surveysettings','read','{"render": {"link": {"data": {"surveyid": ["survey","sid"]}}}}',,'_pluginTabSurvey','en-GB',1, date('Y-m-d H:i:s'),0,date('Y-m-d H:i:s'),0],
];

foreach($basicMenues as $basicMenu){
Expand Down

0 comments on commit 9c1876b

Please sign in to comment.