[zanata/zanata-server] dd6fea: WIP: Extract shared code from ProjectHome and Vers...

GitHub noreply at github.com
Mon Mar 2 05:24:38 UTC 2015


  Branch: refs/heads/locale-aliases_reducing-duplication
  Home:   https://github.com/zanata/zanata-server
  Commit: dd6fea2bbb0e00103e0ffad746e9242bff32a523
      https://github.com/zanata/zanata-server/commit/dd6fea2bbb0e00103e0ffad746e9242bff32a523
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    A zanata-model/src/main/java/org/zanata/model/HasLanguages.java
    M zanata-war/src/main/java/org/zanata/action/HasLanguageSettings.java
    A zanata-war/src/main/java/org/zanata/action/LanguageSettingsHandler.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationLocalesService.java
    M zanata-war/src/main/java/org/zanata/service/LocaleService.java
    M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java

  Log Message:
  -----------
  WIP: Extract shared code from ProjectHome and VersionHome.

Yet to hook up the extracted code to be used in the template.
Aim is to have the LanguageSettingsHandler used as a variable if possible,
but at least to call all the language handling methods directly on that
class.


  Commit: d2a761fbdb3637b30f8a6825964db6b2a063fa89
      https://github.com/zanata/zanata-server/commit/d2a761fbdb3637b30f8a6825964db6b2a063fa89
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-languages.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml

  Log Message:
  -----------
  WIP: (SQUASH) use language settings handler for project.

Still needs cleanup such as:

 - remove obsolete methods in ProjectHome that are now handled by
   the nested language settings handler.
 - check whether security restrictions apply properly
 - inline methods that are only referenced by nested language
   settings handler.


  Commit: 119c423f0098fb7aa22c2104eb37fdd853b53d52
      https://github.com/zanata/zanata-server/commit/119c423f0098fb7aa22c2104eb37fdd853b53d52
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-02-27 (Fri, 27 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageSettingsHandler.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/webapp/project/project.xhtml

  Log Message:
  -----------
  WIP: getting security restrictions and injection working in project languages


  Commit: 9704db6e50fec583ac12a4cb8018947b6ac3ba7b
      https://github.com/zanata/zanata-server/commit/9704db6e50fec583ac12a4cb8018947b6ac3ba7b
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-02-27 (Fri, 27 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageSettingsHandler.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java

  Log Message:
  -----------
  WIP: refactoring to remove duplication in project and version languages


  Commit: 29e6ba92a094d9eff7f70da4dd31a010c40d1b18
      https://github.com/zanata/zanata-server/commit/29e6ba92a094d9eff7f70da4dd31a010c40d1b18
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-02-27 (Fri, 27 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageSettingsHandler.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java

  Log Message:
  -----------
  SQUASH: finish adding restrict calls to language settings


  Commit: a1dd05644b191ffe4b824499dcc0eb79b202f916
      https://github.com/zanata/zanata-server/commit/a1dd05644b191ffe4b824499dcc0eb79b202f916
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-02 (Mon, 02 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageSettingsHandler.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-languages.xhtml

  Log Message:
  -----------
  WIP: trying to figure out why projectSlug is null sometimes

When I call getEnabledLocales in the language settings helper, which
defers to the same in ProjectHome, the slug seems to be null. There
are calls either side in which it is not. I don't understand why.

The only solution here may be to make the LanguageSettingsHandler
subclass within ProjectHome completely private, and have all the
calls in the template be to public methods in ProjectHome that
just call a method on the language settings instance.


Compare: https://github.com/zanata/zanata-server/compare/dd6fea2bbb0e^...a1dd05644b19


More information about the zanata-commits mailing list