Changeset 24423 in main
- Timestamp:
- 01/06/22 20:55:28 (4 months ago)
- Location:
- trunk
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/db/src/main/scripts/mysql/update_tabs.sql
r20835 r24423 31 31 32 32 alter table VALUE_TYPE change column XSLT_FORMAT_PATTERN XSLT_FORMAT_PATTERN varchar(50); 33 alter table VALUE_TYPE change column JAVA_FORMAT_PATTERN JAVA _FORMAT_PATTERN varchar(50);33 alter table VALUE_TYPE change column JAVA_FORMAT_PATTERN JAVASCRIPT_FORMAT_PATTERN varchar(50); 34 34 alter table VALUE_TYPE add column REGEX_VALIDATION_PATTERN varchar(100); 35 35 alter table VALUE_TYPE add column ACTIVE_FLAG varchar(1); -
trunk/ibisph-admin/src/main/webapp/WEB-INF/config/spring/security.xml
r21694 r24423 94 94 <constructor-arg> 95 95 <list> 96 <ref bean="securityPreAuthenticationHeaderStufferFilter"/>97 96 <ref bean="securitySecurityContextPersistenceFilter"/> 98 97 <ref bean="securityLogoutFilter"/> … … 106 105 <constructor-arg> 107 106 <list> 108 <ref bean="securityPreAuthenticationHeaderStufferFilter"/>109 107 <ref bean="securitySecurityContextPersistenceFilter"/> 110 108 <ref bean="securityLogoutFilter"/> … … 118 116 <constructor-arg> 119 117 <list> 120 <ref bean="securityPreAuthenticationHeaderStufferFilter"/>121 118 <ref bean="securitySecurityContextPersistenceFilter"/> 122 119 <ref bean="securityLogoutFilter"/> … … 163 160 <property name="errorPage" value="/WEB-INF/jsp/access_denied.jsp?message=Security Exception"/> 164 161 </bean> 165 </property>166 </bean>167 168 <bean id="securityPreAuthenticationHeaderStufferFilter" class="org.ibisph.web.filter.add.AddRequestHeadersFilter">169 <description>170 This is a filter that can be used for testing preauth or in the case171 of no auth can provide admin privs for the app to be ran locally172 without needing to setup a db user and privs. For testing simply173 import the no auth xml config and modify test entries as desired.174 175 IMPORTANT NOTE: for PRODUCTION, this map should NEVER be populated.176 </description>177 <property name="requestHeadersMap">178 <map>179 <!-- Test Entries180 <entry key="admin" value="#{securityAuthorityAdmin.string}"/>181 <entry key="fullname" value="All Mighty"/>182 <entry key="email" value="administrator@ibisph.org"/>183 184 <entry key="fullname" value="Brian Paoli"/>185 <entry key="email" value="bpaoli@utah.gov"/>186 <entry key="admin" value="NotAnAdmin"/>187 188 <entry key="fullname" value="Jessica Wratha"/>189 <entry key="email" value="JWRATHA@utah.gov"/>190 -->191 </map>192 162 </property> 193 163 </bean> … … 434 404 </bean> 435 405 436 <bean id="securityAuthorizationAuthenticatedVoter" class="org.springframework.security.access.vote.AuthenticatedVoter"/>437 438 406 <bean id="securityAuthorizationRoleVoter" class="org.springframework.security.access.vote.RoleVoter"> 439 407 <property name="rolePrefix" value=""/> … … 468 436 ConsensusBased == majority must vote to allow. 469 437 --> 470 <bean id="securityAuthorizationAccessDecisionManager" class="org.springframework.security.access.vote. AffirmativeBased">471 <constructor-arg> 472 <list> 473 <ref bean="securityAuth orizationAuthenticatedVoter"/>438 <bean id="securityAuthorizationAccessDecisionManager" class="org.springframework.security.access.vote.UnanimousBased"> 439 <constructor-arg> 440 <list> 441 <ref bean="securityAuthenticatedVoter"/> 474 442 <ref bean="securityAuthorizationRoleVoter"/> 475 443 </list> … … 477 445 <property name="allowIfAllAbstainDecisions" value="false"/> 478 446 </bean> 479 <bean id="securityAuthorizationIndicatorAccessDecisionManager" class="org.springframework.security.access.vote. AffirmativeBased">447 <bean id="securityAuthorizationIndicatorAccessDecisionManager" class="org.springframework.security.access.vote.UnanimousBased"> 480 448 <constructor-arg> 481 449 <list> 482 450 <ref bean="securityAuthenticatedVoter"/> 483 <ref bean="securityAuthorizationAuthenticatedVoter"/>484 451 <ref bean="securityAuthorizationIndicatorVoter"/> 485 452 </list> … … 487 454 <property name="allowIfAllAbstainDecisions" value="false"/> 488 455 </bean> 489 <bean id="securityAuthorizationSaveIndicatorAccessDecisionManager" class="org.springframework.security.access.vote. AffirmativeBased">456 <bean id="securityAuthorizationSaveIndicatorAccessDecisionManager" class="org.springframework.security.access.vote.UnanimousBased"> 490 457 <constructor-arg> 491 458 <list> 492 459 <ref bean="securityAuthenticatedVoter"/> 493 <ref bean="securityAuthorizationAuthenticatedVoter"/>494 460 <ref bean="securityAuthorizationSaveIndicatorVoter"/> 495 461 </list> … … 497 463 <property name="allowIfAllAbstainDecisions" value="false"/> 498 464 </bean> 499 500 501 465 502 466 … … 540 504 </bean> 541 505 506 542 507 <!-- ========================================= A C C E S S F I L T E R S --> 543 508 <bean id="securityAuthorizationIndicatorInterceptorFilter" class="org.springframework.security.web.access.intercept.FilterSecurityInterceptor"> -
trunk/ibisph-admin/src/main/webapp/WEB-INF/config/spring/value_type.xml
r16437 r24423 65 65 <entry key="description" value="DESCRIPTION"/> 66 66 <entry key="xsltFormatPattern" value="XSLT_FORMAT_PATTERN"/> 67 <entry key="java FormatPattern" value="JAVA_FORMAT_PATTERN"/>68 <entry key="regExValidationPattern" value="REGEX_VALIDATION_PATTERN"/>67 <entry key="javascriptFormatPattern" value="JAVASCRIPT_FORMAT_PATTERN"/> 68 <entry key="regExValidationPattern" value="REGEX_VALIDATION_PATTERN"/> 69 69 <entry key="rankingFlag" value="RANKING_FLAG"/> 70 70 <entry key="sortOrder" value="SORT_ORDER"/> -
trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/_footer.jsp
r21944 r24423 1 1 <footer id="footer"> 2 2 <a href="http://ibisph.org">IBIS-PH Community</a> 3 <div id="releaseDate"> Release Date: Sept-27-2020</div>3 <div id="releaseDate">Version 3.0.0, Release Date: Jan-16-2022</div> 4 4 </footer> 5 5 -
trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/login/detail.jsp
r21944 r24423 38 38 39 39 <jsp:body> 40 <p> 40 41 The Indicator Based Information System's Data Administration and 41 42 Maintenance Application allows health offices to create, maintain, … … 44 45 to enter this site. If you do not know your username and password 45 46 contact your IBIS-PH Director. 46 < br/><br/>47 </p><br/> 47 48 48 49 <c:if test="${!empty SPRING_SECURITY_LAST_EXCEPTION.message}"> … … 70 71 </td> 71 72 </tr> 73 <tr><td></td></tr> 72 74 <tr> 73 75 <td>Password</td> -
trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/value_type/_help.jsp
r16500 r24423 114 114 </c:set> 115 115 116 <c:set var="java FormatPatternHelp">117 This is used when backend processing needs to format a value. In the past118 this was needed for the Agileblox charts. In future this will be used for119 any backend processing like creating any consumable data. As of 6/20/2018120 this value is not needed. The field exists and should be left in place121 until deemed not needed.116 <c:set var="javascriptFormatPatternHelp"> 117 This is used for front end javascript value formatting when the xslt formatted 118 value is not possible. This use case is typically used for values that are 119 calculated by script like the kendo chart axis values or choropleth map 120 legend ranges. 121 <br/><br/> 122 122 123 XSLT and Java format pattern *MAY* be the same but do differ. As such a 124 distinction is needed. 123 Note for patterns that include an apos or other special string characters 124 those chars will need to be escaped or specified as an embedded special 125 character i.e. for the apos: \'. This will be the case for all javascript 126 type format patterns. 127 <br/><br/> 128 129 In the past this field was named JAVA_FORMAT_PATTERN which was used by the 130 java code to format Agileblox chart values. The javascript format pattern 131 is typically a Kendo.toString pattern. This field is named more generic 132 (i.e. not named "kendo format pattern") so that other javascript libs could 133 be implemented. 125 134 </c:set> 126 135 -
trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/value_type/detail.jsp
r16437 r24423 29 29 <tag:detailTableRowTextArea label="Description" name="description" maxlength="500" rows="5" text="${valueType.description}" help="${descriptionHelp}"/> 30 30 <tag:detailTableRowSeperator/> 31 <tag:detailTableRowTextArea label="RegEx Validation Pattern" name="regExValidationPattern" maxlength="100" rows="3" text="${valueType.regExValidationPattern}" help="${regExValidationPatternHelp}"/> 32 <tag:detailTableRowSeperator/> 31 33 <tag:detailTableRowInput label="XSLT Format Pattern" name="xsltFormatPattern" maxlength="50" value="${valueType.XSLTFormatPattern}" help="${xsltFormatPatternHelp}"/> 32 <tag:detailTableRowInput label="Java Format Pattern" name="javaFormatPattern" maxlength="50" value="${valueType.javaFormatPattern}" help="${javaFormatPatternHelp}"/> 33 <tag:detailTableRowTextArea label="RegEx Validation Pattern" name="regExValidationPattern" maxlength="100" rows="3" text="${valueType.regExValidationPattern}" help="${regExValidationPatternHelp}"/> 34 <tag:detailTableRowInput label="Javascript Format Pattern" name="javascriptFormatPattern" maxlength="50" value="${valueType.javascriptFormatPattern}" help="${javascriptFormatPatternHelp}"/> 34 35 <tag:detailTableRowSeperator/> 35 36 <tag:detailTableRowInput label="Sort Order" name="sortOrder" maxlength="10" value="${valueType.sortOrder}" type="number" cssClass="SortOrder" help="${sortOrderHelp}"/> -
trunk/ibisph-admin/src/main/webapp/css/_general.css
r21373 r24423 35 35 } 36 36 37 p 38 { 39 margin: 0.5em 0; 40 line-height: 1.4em; 41 max-width: 55em; 42 } 37 43 38 44 a /*--- Must be in this order: A, link, visited, hover, active ---*/ … … 90 96 border: solid 1px #777; 91 97 border-radius: 4px; 92 box-shadow: 98 box-shadow: inset 1px 1px 2px #bbb; 93 99 /* 94 100 background : #d0d5e0; … … 115 121 116 122 117 input {padding: 1px 2px 1px 2px;} 123 input, textarea 124 { 125 padding: 4px 2px 3px 4px; 126 } 118 127 119 128 *[disabled='true'], *[disabled='disabled'], *[disabled], … … 130 139 textarea 131 140 { 132 padding: 4px 2px 3px 5px;133 141 overflow: auto; 134 142 } -
trunk/ibisph-admin/src/main/webapp/css/_table.css
r21944 r24423 256 256 { 257 257 display: inline-block; 258 width: calc(100% - 40px);258 width: calc(100% - 50px); 259 259 } 260 260 table.Detail input[type="number"], -
trunk/ibisph/src/main/java/org/ibisph/indicatorprofile/databean/ValueType.java
r16437 r24423 20 20 addField("DESCRIPTION", Field.TYPE_STRING); 21 21 addField("XSLT_FORMAT_PATTERN", Field.TYPE_STRING); 22 addField("JAVA _FORMAT_PATTERN", Field.TYPE_STRING);22 addField("JAVASCRIPT_FORMAT_PATTERN", Field.TYPE_STRING); 23 23 addField("REGEX_VALIDATION_PATTERN", Field.TYPE_STRING); 24 24 addField("SORT_ORDER", Field.TYPE_BIGDECIMAL); … … 41 41 return( getStringFieldValue("XSLT_FORMAT_PATTERN") ); 42 42 } 43 public String getJava FormatPattern() {44 return( getStringFieldValue("JAVA _FORMAT_PATTERN") );43 public String getJavascriptFormatPattern() { 44 return( getStringFieldValue("JAVASCRIPT_FORMAT_PATTERN") ); 45 45 } 46 46 public String getRegExValidationPattern() { -
trunk/ibisph/src/main/java/org/ibisph/indicatorprofile/springsecurity/IndicatorAccessVoter.java
r11123 r24423 75 75 result = ACCESS_GRANTED; 76 76 } 77 /* 77 78 else if(!org.ibisph.util.StrLib.isSomething(requestedName)) { 78 79 result = ACCESS_ABSTAIN; 79 80 } 81 */ 80 82 else if(allowedIndicatorsUserDetails.getAllowedIndicatorNameSet().contains(requestedName)) { 83 result = ACCESS_GRANTED; 84 } 85 else if("list".equals(requestedName) && (0 < allowedIndicatorsUserDetails.getAllowedIndicatorNameSet().size())) { 81 86 result = ACCESS_GRANTED; 82 87 }
Note: See TracChangeset
for help on using the changeset viewer.