Skip to content

Commit

Permalink
resolved naming issues, tooltype not working and added try-catch on d…
Browse files Browse the repository at this point in the history 
…b table creation
  • Loading branch information
@guustnieuwenhuis
guustnieuwenhuis committed Sep 13, 2022
1 parent e7ff229 commit b5fee32
Show file tree
Hide file tree
Showing 7 changed files with 105 additions and 92 deletions.
6 changes: 3 additions & 3 deletions box.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"author":"We Are Orange BV",
"author":"We Are North Groep BV",
"organization": "MasaCMS",
"bugs":"https://github.com/MasaCMS/MasaTranslations/issues",
"changelog":"",
Expand Down Expand Up @@ -59,6 +59,6 @@
"scripts":{},
"shortDescription":"This plugin manages translations between multiple Masa CMS sites and locales.",
"slug":"MasaTranslations",
"type":"plugins",
"version":"4.1.0"
"type":"modules",
"version":"4.1.1"
}
36 changes: 22 additions & 14 deletions display_objects/muratranslationsnavtools/configurator.cfm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,26 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
*/
param name="objectparams.muratranslationstooltype" default="list";
param name="objectparams.async" default="true";
param name="objectparams.render" default="server";
param name="objectparams.masatranslationstooltype" default="list";
</cfscript>
<cfoutput>
<div class="mura-control-group">
<label class="mura-control-label" for="muratranslationstooltype">Tool Type</label>
<label class="radio inline">
<input type="radio" class="objectParam" name="muratranslationstooltype" value="list" <cfif objectparams.muratranslationstooltype eq 'list'> checked="checked"</cfif> />
List
</label>
<label class="radio inline">
<input type="radio" class="objectParam" name="muratranslationstooltype" value="selectbox" <cfif objectparams.muratranslationstooltype eq 'selectbox'> checked="checked"</cfif> />
SelectBox
</label>
</div>
</cfoutput>
<cfsavecontent variable="data.html">
<cf_objectconfigurator params="#objectparams#">
<cfoutput>
<div class="mura-control-group">
<label class="mura-control-label" for="masatranslationstooltype">Tool Type</label>
<label class="radio inline">
<input type="radio" class="objectParam" name="masatranslationstooltype" value="list" <cfif objectparams.masatranslationstooltype eq 'list'> checked="checked"</cfif> />
List
</label>
<label class="radio inline">
<input type="radio" class="objectParam" name="masatranslationstooltype" value="selectbox" <cfif objectparams.masatranslationstooltype eq 'selectbox'> checked="checked"</cfif> />
SelectBox
</label>
</div>
</cfoutput>
</cf_objectconfigurator>
</cfsavecontent>
<cfoutput>#createObject("component","mura.json").encode(data)#</cfoutput>
<cfabort>
12 changes: 6 additions & 6 deletions display_objects/muratranslationsnavtools/index.cfm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
*/
param name="objectparams.muratranslationstooltype" default="list";
param name="objectparams.masatranslationstooltype" default="list";
pluginpath = m.globalConfig('context') & '/plugins/MuraTranslations';
pluginConfig = m.getPlugin('MuraTranslations');
translationManager = CreateObject('component', 'MuraTranslations.cfcs.translationManager').init(m.globalConfig(),pluginConfig);
pluginpath = m.globalConfig('context') & '/plugins/MasaTranslations';
pluginConfig = m.getPlugin('MasaTranslations');
translationManager = CreateObject('component', 'MasaTranslations.cfcs.translationManager').init(m.globalConfig(),pluginConfig);
rsLocales = translationManager.getAssignedSites(m.siteConfig('siteid'));
</cfscript>
<cfoutput>
<cfif rsLocales.recordcount>
<cfif objectparams.muratranslationstooltype eq 'selectbox'>
<cfif objectparams.masatranslationstooltype eq 'selectbox'>
<select class="form-control translations-nav" onchange="location.href=this.value;">
<option value="">
#esapiEncode('html', translationManager.getTranslationKeys().setSiteID(m.siteConfig('siteid')).load().getSelectorLabel())#
Expand All @@ -36,7 +36,7 @@
<cfif len(selectorLabel)>
<h3>#esapiEncode('html', selectorLabel)#</h3>
</cfif>

<ul>
<cfloop query="rslocales">
<cfsilent>
Expand Down
2 changes: 1 addition & 1 deletion index.cfm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
</tr>
<tr>
<td class="var-width">Nav Tools</td>
<td class="var-width">##m.dspObject(object='muratranslationstools')##</td>
<td class="var-width">##m.dspObject(object='masatranslationstools')##</td>
</tr>
</table>
</div> <!-- /.block-content -->
Expand Down
6 changes: 3 additions & 3 deletions plugin/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<name>Masa Translations</name>
<package>MasaTranslations</package>
<directoryFormat>packageOnly</directoryFormat>
<version>4.1.0</version>
<provider>We Are Orange BV</provider>
<providerURL>https://www.weareorange.eu/</providerURL>
<version>4.1.1</version>
<provider>We Are North Groep BV</provider>
<providerURL>https://www.wearenorth.eu/</providerURL>
<category>Application</category>
<settings>
<setting>
Expand Down
133 changes: 69 additions & 64 deletions plugin/plugin.cfc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,71 +31,76 @@
<cfset var x = "">
<cfset var aSql = "">

<cfif application.configBean.getDBType() eq "mysql">
<cfsavecontent variable="sql">
<cfinclude template="../dbScripts/mysqlInstall.cfm">
</cfsavecontent>

<cfset aSql = ListToArray(sql, ';')>

<cfloop index="x" from="1" to="#arrayLen(aSql)#">
<cfif len(trim(aSql[x]))>
<cfquery datasource="#application.configBean.getDatasource()#" username="#application.configBean.getDBUsername()#" password="#application.configBean.getDBPassword()#">
#keepSingleQuotes(aSql[x])#
</cfquery>
</cfif>
</cfloop>

<cfset applyUpdates()/>

<cfelseif application.configBean.getDBType() eq "postgresql">
<cfsavecontent variable="sql">
<cfinclude template="../dbScripts/postgresqlInstall.cfm">
</cfsavecontent>

<cfset aSql = ListToArray(sql, ';')>

<cfloop index="x" from="1" to="#arrayLen(aSql)#">
<cfif len(trim(aSql[x]))>
<cfquery datasource="#application.configBean.getDatasource()#" username="#application.configBean.getDBUsername()#" password="#application.configBean.getDBPassword()#">
#keepSingleQuotes(aSql[x])#
<cftry>
<cfif application.configBean.getDBType() eq "mysql">
<cfsavecontent variable="sql">
<cfinclude template="../dbScripts/mysqlInstall.cfm">
</cfsavecontent>

<cfset aSql = ListToArray(sql, ';')>

<cfloop index="x" from="1" to="#arrayLen(aSql)#">
<cfif len(trim(aSql[x]))>
<cfquery datasource="#application.configBean.getDatasource()#" username="#application.configBean.getDBUsername()#" password="#application.configBean.getDBPassword()#">
#keepSingleQuotes(aSql[x])#
</cfquery>
</cfif>
</cfloop>

<cfset applyUpdates()/>

<cfelseif application.configBean.getDBType() eq "postgresql">
<cfsavecontent variable="sql">
<cfinclude template="../dbScripts/postgresqlInstall.cfm">
</cfsavecontent>

<cfset aSql = ListToArray(sql, ';')>

<cfloop index="x" from="1" to="#arrayLen(aSql)#">
<cfif len(trim(aSql[x]))>
<cfquery datasource="#application.configBean.getDatasource()#" username="#application.configBean.getDBUsername()#" password="#application.configBean.getDBPassword()#">
#keepSingleQuotes(aSql[x])#
</cfquery>
</cfif>
</cfloop>

<cfset applyUpdates()/>

<cfelseif application.configBean.getDBType() eq "mssql">
<cfsavecontent variable="sql">
<cfinclude template="../dbScripts/mssqlInstall.cfm">
</cfsavecontent>

<cfquery datasource="#application.configBean.getDatasource()#" username="#application.configBean.getDBUsername()#" password="#application.configBean.getDBPassword()#">
#keepSingleQuotes(sql)#
</cfquery>
</cfif>
</cfloop>

<cfset applyUpdates()/>

<cfelseif application.configBean.getDBType() eq "mssql">
<cfsavecontent variable="sql">
<cfinclude template="../dbScripts/mssqlInstall.cfm">
</cfsavecontent>

<cfquery datasource="#application.configBean.getDatasource()#" username="#application.configBean.getDBUsername()#" password="#application.configBean.getDBPassword()#">
#keepSingleQuotes(sql)#
</cfquery>

<cfset applyUpdates()/>

<cfelseif application.configBean.getDBType() eq "oracle">
<cfsavecontent variable="sql">
<cfinclude template="../dbScripts/oracleInstall.cfm">
</cfsavecontent>

<cfset aSql = ListToArray(sql, ';')>

<cfloop index="x" from="1" to="#arrayLen(aSql) - 1#">
<cfif len(trim(aSql[x]))>
<cfquery datasource="#application.configBean.getDatasource()#" username="#application.configBean.getDBUsername()#" password="#application.configBean.getDBPassword()#">
#keepSingleQuotes(aSql[x])#
</cfquery>
</cfif>
</cfloop>

<cfset applyUpdates()/>
<cfelse>
<h1>Only MySQL, Microsoft SQL Server, PostgreSQL and Oracle are supported.</h1>
<cfabort>
</cfif>

<cfset applyUpdates()/>

<cfelseif application.configBean.getDBType() eq "oracle">
<cfsavecontent variable="sql">
<cfinclude template="../dbScripts/oracleInstall.cfm">
</cfsavecontent>

<cfset aSql = ListToArray(sql, ';')>

<cfloop index="x" from="1" to="#arrayLen(aSql) - 1#">
<cfif len(trim(aSql[x]))>
<cfquery datasource="#application.configBean.getDatasource()#" username="#application.configBean.getDBUsername()#" password="#application.configBean.getDBPassword()#">
#keepSingleQuotes(aSql[x])#
</cfquery>
</cfif>
</cfloop>

<cfset applyUpdates()/>
<cfelse>
<h1>Only MySQL, Microsoft SQL Server, PostgreSQL and Oracle are supported.</h1>
<cfabort>
</cfif>
<cfcatch type="any">

</cfcatch>
</cftry>
</cffunction>

<cffunction name="update" returntype="void" access="public" output="false">
Expand Down
2 changes: 1 addition & 1 deletion search.cfm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<div class="mura-header">
<h1>#pluginConfig.getName()#</h1>
<div class="nav-module-specific btn-group">
<a class="btn" <cfif arrayLen(crumbdata) gt 30>href="##" onclick="history.go(-1);"<cfelse>href="#application.configBean.getContext()#/admin/index.cfm?muraaction=cArch.edit&contenthistid=#request.contentHistID#&siteid=#request.localSiteID#&contentid=#request.localID#&topid=#request.localID#&type=#request.type#&parentid=#request.parentID#&moduleid=00000000000000000000000000000000000##tabsysMuraTranslations"</cfif>><i class="mi-arrow-circle-left"></i>Return</a></li>
<a class="btn" <cfif arrayLen(crumbdata) gt 30>href="##" onclick="history.go(-1);"<cfelse>href="#application.configBean.getContext()#/admin/index.cfm?muraaction=cArch.edit&contenthistid=#request.contentHistID#&siteid=#request.localSiteID#&contentid=#request.localID#&topid=#request.localID#&type=#request.type#&parentid=#request.parentID#&moduleid=00000000000000000000000000000000000##tabsysMasaTranslations"</cfif>><i class="mi-arrow-circle-left"></i>Return</a></li>
</div>
</div>

Expand Down

0 comments on commit b5fee32

Please sign in to comment.